Removed code smells. Unused imports and variables, commented code.