More cleanup and fix backuptool

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