more cleanup - making dump work for vm