removed unused imports
removed unneeded code