Added functionality to delete the mapping when a user is deleted. A group too?