[IMP] cleaning code