Cleans up imports for several files