removed legacy device code