grid cleanup

grid cleanup