Implement ability to remove mapping