Small change to remove unecessary timeout values