Cleaning up main converter