[COREVM-70] Code cleanup