Remove all use of MappingService and override json converter