Using new endpoint library to save device name
Remove things for debuggin (logging, extra checks)