useless code removed from Machine