Clean uo
Small changes and fixes around apn devices