remove extra code, cleaned up maps