More cleanup

Signed-off-by: Varun Chitre <varun.chitre15@gmail.com>