Removed unused imports and set logger from module

Change-Id: Ic6ebc79355218b976c6cf163f226fbf85942e8b8