Removed legacy unused imports