Miscellaneous cleanup

Signed-off-by: Amit Gupta <agupta@pivotal.io>