diff --git a/src/mpsd_software_manager/mpsd_software.py b/src/mpsd_software_manager/mpsd_software.py
index f264cc45899332b1e5e1fb8fcd8e72a75205c393..ce13d8aed6b4119817afbef2c07dfab945e44878 100755
--- a/src/mpsd_software_manager/mpsd_software.py
+++ b/src/mpsd_software_manager/mpsd_software.py
@@ -1086,6 +1086,12 @@ def remove_environment(mpsd_release, root_dir, package_sets="NONE", force_remove
         f" with package_sets {package_sets} from {root_dir}"
     )
     logging.warning(msg)
+    # Handle 3 situations :
+    # 1. remove dosent specify what to remove  -> warn and exit
+    # 1. remove all package_sets from release -> remove release folder except logs
+    # 2. remove specific package_sets from release
+    #       -> remove spack environments via spack commands
+
     if package_sets == "NONE":
         logging.warning(
             "Please specify package_sets to remove, or 'ALL' to remove all toolchains"