removed code smells

Removed some unused imports and two statements from one line

Issue-ID: DMAAP-1415
Change-Id: I2802078fc8063a65de748d2399710f97c9adee8e
Signed-off-by: Rupinder <rupinsi1@in.ibm.com>
5 files changed