increase timeout and cleanup