removed unused imports
some more changes