[COREVM-84] Code cleanup