[vipul] clean up