Removed some pointers from GameMap