Could we actually leave this one here and remove the one at the stop of server.New? I like having this one close to SetMachineState