[IMP] - continue code cleaning for migration