Clean up the custom importer

:+1: