More grids, cleanup