Cleaned up unused objects in the map