Removing unused imports and unsued class.