The Great Clean-up (2/2)

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