cleanup grids and org