BalajiN | Added support for removing mapping