[IMP] continue code cleaning for migration to v8