Update device and more cleaning repo