More clean up of the grid builder