Simplfy, remove unnecessary timeout related code.