Cleanup Part 1

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