Added remove a mapping feature