Cleanup vhsot generation parts