Some pending cleanup.

Signed-off-by: Rocky Jaiswal <rocky.jaiswal@gmail.com>