SWITCHYARD-1873 - Cleanup of unneeded custom converters