Fix to remove running VM instantiated through ONE client or sunstone