gh-1 Tidy up grids