Better way to clean timeouts