Cleanup: Part 4

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