diff --git a/dokku b/dokku
index cd837fe90..dd445a9ba 100755
--- a/dokku
+++ b/dokku
@@ -61,12 +61,6 @@ case "$1" in
       oldid=$(< "$DOKKU_ROOT/$APP/CONTAINER")
     fi
 
-    # CNAME
-    CNAME=$(docker run -i $IMAGE /bin/bash -c "if [[ -f /app/CNAME ]];then cat /app/CNAME; fi")
-    if [[ -n "$CNAME" ]]; then
-      echo "$CNAME" > "$DOKKU_ROOT/$APP/CNAME"
-    fi
-
     # start the app
     DOCKER_ARGS=$(: | pluginhook docker-args $APP)
     id=$(docker run -d -p 5000 -e PORT=5000 $DOCKER_ARGS $IMAGE /bin/bash -c "/start web")
diff --git a/plugins/nginx-vhosts/post-deploy b/plugins/nginx-vhosts/post-deploy
index 4cad46543..1e0b1e7fe 100755
--- a/plugins/nginx-vhosts/post-deploy
+++ b/plugins/nginx-vhosts/post-deploy
@@ -25,10 +25,6 @@ EOF
     SSL_DIRECTIVES=""
   fi
 
-  if [[ -f "$DOKKU_ROOT/$APP/CNAME" ]]; then
-    hostname=$(< "$DOKKU_ROOT/$APP/CNAME" )
-  fi
-
   # ssl based nginx.conf
   if [[ -n "$SSL_INUSE" ]]; then
   cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf