Cleaning up - particularly cut/paste code in LicenseImportController