Removed mappers
Cleanup