Drop some weird logic from map class