diff --git a/Dockerfile b/Dockerfile
index edcaca9..982cb09 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,29 +13,6 @@ RUN apt-get update \
 # Set the default timezone for the container
 RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime
 
-# Add NNCP
-RUN echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list
-
-RUN apt-get update \
-        && apt-get install -yyq nncp less ssmtp \
-        && mkdir /etc/nncp \
-        && apt-get -y autoremove \
-        && apt-get clean \
-        && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/nncp
-
-# Add in Leenooks' apt repository
-#RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=bullseye bash
-
-# Add ZeroTier
-#RUN echo "deb [trusted=yes] http://download.zerotier.com/debian/bullseye bullseye main" > /etc/apt/sources.list.d/zerotier.list
-
-# Leenooks Utils
-#RUN apt-get update \
-#    && apt-get install -yqq zerotier-one \
-#    && apt-get -y autoremove \
-#    && apt-get clean \
-#    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
 # Other Utilities
 #RUN echo "deb http://deb.debian.org/debian stretch main contrib" > /etc/apt/sources.list.d/contrib.list
 #RUN apt-get update \
@@ -77,14 +54,11 @@ WORKDIR /opt/sbbs
 ENV SBBSCTRL=/opt/sbbs/ctrl
 ENV SBBSEXEC=/opt/sbbs/exec
 ENV PATH=$PATH:${SBBSEXEC}
-ENV NNCPCFG /etc/nncp/nncp.conf
 
 COPY start.sh ${SBBSEXEC}/
 COPY doorparty.js ${SBBSEXEC}/
 COPY main.cnf /opt/sbbs/ctrl.orig/
 
-VOLUME [ "/var/lib/zerotier-one" ]
-VOLUME [ "/var/spool/nncp","/etc/nncp" ]
 VOLUME [ "/opt/sbbs/data","/opt/sbbs/ctrl","/opt/sbbs/fido","/opt/sbbs/mods","/opt/sbbs/text","/opt/sbbs/web" ]
 
 COPY logrotate.d /etc/logrotate.d/
diff --git a/supervisord.d/nncp.conf b/supervisord.d/nncp.conf
deleted file mode 100644
index df9da2d..0000000
--- a/supervisord.d/nncp.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[program:nncp]
-#environment=NNCPCFG="/etc/nncp/nncp.conf"
-command=/usr/bin/nncp-daemon -autotoss
-startsecs=10
-startretries=2