diff --git a/.travis.yml b/.travis.yml
index 13eea5d4..ab3995ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,9 +35,6 @@ script:
     - ./autogen.sh
     - ./configure && make
     - cd build && cmake ../ && make
-    # Test cmake using our builder
-    # - cd docker/build && docker build -f builder.Dockerfile -t builder . && cd -
-    # - docker run --rm -it -v $PWD:/src -w /src builder sh -c /src/docker/build/dockerbuild.sh
 branches:
     only:
         - master
@@ -47,19 +44,3 @@ notifications:
     email:
         on_success: change
         on_failure: always
-
-# Use cache to speedup next build
-services:
-  - docker
-
-before_cache:
-  # Save tagged docker images
-  - >
-    mkdir -p $HOME/docker && docker images -a --filter='dangling=false' --format '{{.Repository}}:{{.Tag}} {{.ID}}'
-    | xargs -n 2 -t sh -c 'test -e $HOME/docker/$1.tar.gz || docker save $0 | gzip -2 > $HOME/docker/$1.tar.gz'
-
-cache:
-  bundler: true
-  directories:
-    - $HOME/docker
-
diff --git a/src/local.c b/src/local.c
index 475a18e7..b75f2c42 100644
--- a/src/local.c
+++ b/src/local.c
@@ -1110,6 +1110,7 @@ close_and_free_server(EV_P_ server_t *server)
     if (server != NULL) {
         ev_io_stop(EV_A_ & server->send_ctx->io);
         ev_io_stop(EV_A_ & server->recv_ctx->io);
+        ev_timer_stop(EV_A_ & server->delayed_connect_watcher);
         close(server->fd);
         free_server(server);
     }