grid cleanup phase #1
Merge branch 'cleanup-grid'