Further map cleanup.