remove statement::invalid (#2597)

10 jobs for master in 32 minutes and 40 seconds (queued for 4 seconds)