Clean up Grid.php