Removes TODO related to timeout