diff --git a/first-network/byfn.sh b/first-network/byfn.sh
index df17cc33..80b7bade 100755
--- a/first-network/byfn.sh
+++ b/first-network/byfn.sh
@@ -85,9 +85,8 @@ function askProceed () {
 }
 
 # Obtain CONTAINER_IDS and remove them
-# TODO Might want to make this optional - could clear other containers
 function clearContainers () {
-  CONTAINER_IDS=$(docker ps -aq)
+  CONTAINER_IDS=$(docker ps --filter "name=^/dev-peer|^/peer|^/orderer|cli" -aq)
   if [ -z "$CONTAINER_IDS" -o "$CONTAINER_IDS" == " " ]; then
     echo "---- No containers available for deletion ----"
   else