[MP] Clean up VM handling