Remove dynamic timeout stuff
Shorten disconnect timeout; 30 seconds is far too long
Update TODO