Remove repeated grid style classes
Merge pull request #2180 from darkwing/grid-cleanup

Remove repeated grid style classes