Clean up manual timeouts in features