diff --git a/tools/helpers2.1/convert_to_helpers_2.1.py b/tools/helpers2.1/convert_to_helpers_2.1.py
index 3ef988e4..18bada3a 100644
--- a/tools/helpers2.1/convert_to_helpers_2.1.py
+++ b/tools/helpers2.1/convert_to_helpers_2.1.py
@@ -84,7 +84,7 @@ def cleanup():
         (r"--message=?", ""),
         (r"--time ", ""),
         (r"--last", ""),
-        (r"--weight=?\S*", ""),
+        (r"\s*--weight=?\S*", ""),
         # rm
         (r"ynh_secure_remove( --file=?)? ?", "ynh_safe_rm "),
         # Conf / templating
@@ -155,15 +155,15 @@ def cleanup():
         (r'--install_args="?([^"]+)"?(\s|$)', "\\1\\2"),
         (r'--commands="([^"]+)"(\s|$)', "\\1\\2"),
         # Nodejs
+        (r'"?\$?ynh_node"?', "node"),
         (r"NODEJS_VERSION=", "nodejs_version="),
         (r"ynh_install_nodejs \S*", "ynh_nodejs_install"),
         (r"ynh_install_nodejs", "ynh_nodejs_install"),
         (r"ynh_remove_nodejs", "ynh_nodejs_remove"),
-        (r"ynh_use_nodejs", "# REMOVEME? ynh_use_nodejs"),
+        (r"ynh_use_nodejs", ""),
         (r'"?\$ynh_node_load_PATH"?', ""),
         (r'"?\$ynh_node_load_path"?', ""),
         (r'"?\$?ynh_npm"?', "npm"),
-        (r'"?\$?ynh_node"?', "node"),
         (r'(export )?COREPACK_ENABLE_DOWNLOAD_PROMPT=0', ""),
         (r'env\s+npm', "npm"),
         (r'env\s+pnpm', "pnpm"),
@@ -174,7 +174,7 @@ def cleanup():
         (r"ynh_install_ruby \S*", "ynh_ruby_install"),
         (r"ynh_install_ruby", "ynh_ruby_install"),
         (r"ynh_remove_ruby", "ynh_ruby_remove"),
-        (r"ynh_use_ruby", "# REMOVEME? ynh_use_ruby"),
+        (r"ynh_use_ruby", ""),
         (r'"?\$ynh_ruby_load_PATH"?', ""),
         (r'"?\$ynh_ruby_load_path"?', ""),
         (r'"?\$?ynh_ruby"?', "ruby"),
@@ -184,7 +184,7 @@ def cleanup():
         (r"ynh_install_go \S*", "ynh_go_install"),
         (r"ynh_install_go", "ynh_go_install"),
         (r"ynh_remove_go", "ynh_go_remove"),
-        (r"ynh_use_go", "# REMOVEME? ynh_use_go"),
+        (r"ynh_use_go", ""),
         (r'"?\$?ynh_go"?', "go"),
         # Mongodb
         (r"YNH_MONGO_VERSION", "mongo_version"),