various cleanups and changes to device files