More cleanup

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