BUG: Remove unneeded timeout