Implemented Timeout of 5sec. for upload.

Timout on server-side.
Timeout disconnects client.

Removed some TODOs.