Updated nMachine, removed useless classes