Update deps, restore cleanup timeout