Cleanup Part 2

Change-Id: I14321211732a49f86ccf90b293c19499a56c3f7e
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>