Fixed mapping removal problem when deleting a user