Clear timeouts properly #2

:blush: @mihneadb