Removed commented-out code for Grid and Environment classes.