machines.inc cleanup