[IMP] continue code cleaning for v8