Better nodes removal in virtualbox

Change-Id: Ic4e0f84994bb9e67f466ac07c65b11ca008248b3
Merge "Better nodes removal in virtualbox"