[COREVM-60] Code cleanup