More map cleanup