Code review changes

Few changes to code quality : removing warning messages, removing unused imports, updated exception logs and removing wrapper class.