Remove the double device checking step