removed unnecessary imports
removed unused code