Base   :    Removed some old DeviceComponent hacks that weren't necessary