clean up MachineEntity in preparation for implementing components