Fix: remove by timeout