Devices now also cleaned up from getDevices API