Adding Timeout clearance