remove device checking