Remove unused machines and prefix vars