restrict to master: rhs, remove unused code

3 jobs for parallel-grid-wip in 2 minutes and 30 seconds (queued for 1 second)