Cleanup in Grid.java