grid cleanup phase #1