Grid cleanup and port existing grids