got rid of the Timeout class