Cleanup

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