clean up the shit from pavan commit