Removed unused imports and objects
Updated the version