Removed legacy code, and a migrant import.