diff --git a/builder/image-ros.sh b/builder/image-ros.sh
index df30e495..1db420aa 100755
--- a/builder/image-ros.sh
+++ b/builder/image-ros.sh
@@ -72,19 +72,12 @@ my_travis_retry() {
 
 echo_stamp "Install rosdep"
 my_travis_retry pip3 install -U rosdep
-# ls /etc/ros/rosdep/sources.list.d/
-
-# echo_stamp "Install ROS"
-# my_travis_retry apt-get install -y ros-${ROS_DISTRO}-ros-base ros-${ROS_DISTRO}-catkin
-# source /opt/ros/noetic/setup.bash
-# export ROS_IP='127.0.0.1' # needed for running tests
 
 # TODO: 'kinetic-rosdep-clover.yaml' should add only if we use our repo?
 echo_stamp "Init rosdep"
 my_travis_retry rosdep init
 
 echo_stamp "Update rosdep"
-# FIXME: Re-add this after missing packages are built
 echo "yaml file:///etc/ros/rosdep/noetic-bookworm.yaml" >> /etc/ros/rosdep/sources.list.d/20-default.list
 my_travis_retry rosdep update
 
diff --git a/builder/image-software.sh b/builder/image-software.sh
index 073029a2..348ad920 100755
--- a/builder/image-software.sh
+++ b/builder/image-software.sh
@@ -121,15 +121,6 @@ python3-pip
 sed -i "s/updates_available//" /usr/share/byobu/status/status
 # sed -i "s/updates_available//" /home/pi/.byobu/status
 
-# echo_stamp "Installing pip"
-# curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-# curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip2.py
-# python3 get-pip.py
-# python get-pip2.py
-# rm get-pip.py get-pip2.py
-# #my_travis_retry pip install --upgrade pip
-# #my_travis_retry pip3 install --upgrade pip
-
 echo_stamp "Make sure pip is installed"
 pip --version
 pip3 --version
@@ -138,11 +129,6 @@ echo "Enable installing packages with pip"
 mv /usr/lib/python3.11/EXTERNALLY-MANAGED /usr/lib/python3.11/EXTERNALLY-MANAGED.old
 
 echo_stamp "Install and enable Butterfly (web terminal)"
-# echo_stamp "Workaround for tornado >= 6.0 breaking butterfly"
-# export CRYPTOGRAPHY_DONT_BUILD_RUST=1
-# my_travis_retry pip3 install cryptography==3.4.6 # https://stackoverflow.com/a/68472128/6850197
-# my_travis_retry pip3 install pyOpenSSL==20.0.1
-# my_travis_retry pip3 install tornado==5.1.1
 my_travis_retry pip3 install butterfly
 my_travis_retry pip3 install butterfly[systemd]
 systemctl enable butterfly.socket
@@ -165,11 +151,9 @@ rm -rf node-v10.15.0-linux-armv6l/
 rm node-v10.15.0-linux-armv6l.tar.gz
 
 echo_stamp "Installing ptvsd"
-#my_travis_retry pip install ptvsd
 my_travis_retry pip3 install ptvsd
 
 echo_stamp "Installing pyzbar"
-#my_travis_retry pip install pyzbar
 my_travis_retry pip3 install pyzbar
 
 echo_stamp "Add .vimrc"
diff --git a/builder/image-validate.sh b/builder/image-validate.sh
index cc53162d..c4118828 100755
--- a/builder/image-validate.sh
+++ b/builder/image-validate.sh
@@ -20,7 +20,6 @@ export ROS_DISTRO='noetic'
 export ROS_IP='127.0.0.1'
 source /opt/ros/${ROS_DISTRO}/setup.bash
 source /home/pi/catkin_ws/devel/setup.bash
-env
 
 cd /home/pi/catkin_ws/src/clover/builder/test/
 ./tests.sh
diff --git a/builder/test/tests.sh b/builder/test/tests.sh
index a07452ef..b1d49593 100755
--- a/builder/test/tests.sh
+++ b/builder/test/tests.sh
@@ -43,8 +43,6 @@ fi
 
 roscore -h
 catkin_find
-env
-tree /home/pi/catkin_ws
 rosversion clover
 rosversion aruco_pose
 rosversion mavros