remove and add functionality shifted to the MappingFileManager
Authored by: samantprajakta 2013-06-27
Parent: [r936]
Child: [r938]