Spike 1: Clean up of grid and fields.