#218 Clarify remove called even if mapping does not exist.