Added EOT chars to timeout msgs
Removed a bunch of commented out code