And more cleanup.

Signed-off-by: Tushar Narayan <tusharnarayan@gmail.com>