Deviceinfo cleanup

See commit log. This was mostly done automatically as indicated in the commits.

Probably not worth to look at the changes itself :P