Removed a device or two, minor changes