Small tidyup
Makes removeMapping optional