Cleaning up returns for import methods