Removes obsolete imports - fixing compile errors?