Device removal on timeout