General map cleanup.