Removed the IMapperAware

Removed the IMapperAware options
- restart the development branch