removing timeout logic