Visual fixes for GridView in 2.3
Remove dead code