Removed unused defines
Connection timeout is now configurable