Remove obsolete files and update import statements.