Fixed: revert back changes in devicecontroller - was weird