Eliminate dependecy on device 1.3