Removed self-defined Mapper class
The last of the Mappers