More cleanup
Lots of device server updates