Change timeout message and delete unnecessary commented code