Resovling build errors and some cleanups.

Signed-off-by: Kumar Amit Mehta <gmate.amit@gmail.com>