Address some issues with the Udev classes

Aleix Pol Gonzalezrequested to merge
work/duplicated-code into master

Removes duplicated code for readability. Removes complexity with using it as it was crashy (also hidden under ifs so we were not seeing it).

Merge request reports