removed old implementation and the VM conditionals