#6 removing unused imports and variables