diff --git a/src/initial-setup.sh b/src/initial-setup.sh
index 305e2ca..387b309 100755
--- a/src/initial-setup.sh
+++ b/src/initial-setup.sh
@@ -2,29 +2,29 @@
 
 export DEBIAN_FRONTEND=noninteractive
 
-apt-get -y purge\
- cloud-init cloud-guest-utils\
- cloud-initramfs-copymods cloud-initramfs-dyn-netconf\
+apt-get -y purge \
+ cloud-init cloud-guest-utils \
+ cloud-initramfs-copymods cloud-initramfs-dyn-netconf \
  open-iscsi
 rm -rf /etc/cloud/ /var/lib/cloud/
 
 apt-get update
 
-apt-get -y\
- -o Dpkg::Options::="--force-confdef"\
- -o Dpkg::Options::="--force-confold"\
+apt-get -y \
+ -o Dpkg::Options::="--force-confdef" \
+ -o Dpkg::Options::="--force-confold" \
  upgrade
 
-apt-get -y install\
- vim\
- gparted\
- libc6:armhf libstdc++6:armhf\
- lxterminal\
+apt-get -y install \
+ vim \
+ gparted \
+ libc6:armhf libstdc++6:armhf \
+ lxterminal \
  usbmount
 
 # Workaround for usbmount bug on Bionic
 mkdir -p /etc/systemd/system/systemd-udevd.service.d
-echo "[Service]\nMountFlags=shared\n" >\
+echo "[Service]\nMountFlags=shared\n" > \
  /etc/systemd/system/systemd-udevd.service.d/override.conf
 systemctl daemon-reload
 service systemd-udevd --full-restart
diff --git a/src/user-data b/src/user-data
index 3f6e534..afaaa7a 100644
--- a/src/user-data
+++ b/src/user-data
@@ -41,19 +41,11 @@ apt:
 packages: ['torch-agent']
 
 runcmd:
-  # Disable optional PAM features for faster SSH login
-#  - 'mv /etc/pam.d/sshd /etc/pam.d/sshd.bak'
-#  - 'sed "s/^session[ \t]\+optional/#\0/" /etc/pam.d/sshd.bak > /etc/pam.d/sshd'
-
-  # Back up the SSH default config and activate the new config
-#  - 'mv /etc/ssh/sshd_config /etc/ssh/sshd_config.bak'
-#  - 'mv /etc/ssh/sshd_config.new /etc/ssh/sshd_config'
-#  - 'service ssh reload'
 
   # Multi-arch support on aarch64
   - 'dpkg --add-architecture armhf'
 
-  # Run optional script for additoinal package setup
+  # Run setup scripts
   - '/boot/firmware/cloud-init/initial-setup.sh'
   - '/boot/firmware/cloud-init/configure-torch.sh'
   - 'reboot now'