Added connection timeout, removed extra logging