OMS VM is not removed on cleanup (OPS-7)