cleanup, increase timeout