The Great Clean-up (1/2)

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