removed unused imports
revode obsolete code