Final Grid cleanup items
Merge branch 'cleanup-grid-3'