clean MR codebase

Issue-ID: DMAAP-1199
Change-Id: Ieff7939b02a8987b6101dd1c0ec886b474f1fa82
Signed-off-by: sunil.unnava <sunil.unnava@att.com>
30 files changed