diff --git a/scripts/install b/scripts/install
index 43a2343..5d80586 100644
--- a/scripts/install
+++ b/scripts/install
@@ -17,10 +17,10 @@ preinstall=0
 # ADD SWAP
 #=================================================
 
-if [ "${PACKAGE_CHECK_EXEC:-0}" -ne 1 ]; then
-    ynh_script_progression --message="Adding swap..." --weight=1
-    ynh_add_swap --size=$swap_needed
-fi
+# if [ "${PACKAGE_CHECK_EXEC:-0}" -ne 1 ]; then
+#     ynh_script_progression --message="Adding swap..." --weight=1
+#     ynh_add_swap --size=$swap_needed
+# fi
 
 #=================================================
 # CREATE A POSTGRESQL DATABASE
@@ -69,7 +69,7 @@ popd
 #=================================================
 # SETUP DATABASE
 #=================================================
-ynh_script_progression --message="Setuping the database..." --weight=1
+ynh_script_progression --message="Setting up the database..." --weight=1
 
 setup_database
 
diff --git a/scripts/remove b/scripts/remove
index f6d3408..2f1994a 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -38,10 +38,10 @@ ynh_secure_remove --file="/var/log/$app.log"
 # REMOVE SWAP
 #=================================================
 
-if [ "${PACKAGE_CHECK_EXEC:-0}" -ne 1 ]; then
-    ynh_script_progression --message="Removing swap..." --weight=1
-    ynh_del_swap
-fi
+# if [ "${PACKAGE_CHECK_EXEC:-0}" -ne 1 ]; then
+#     ynh_script_progression --message="Removing swap..." --weight=1
+#     ynh_del_swap
+# fi
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/restore b/scripts/restore
index 31f4a95..798f23d 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -12,10 +12,10 @@ source /usr/share/yunohost/helpers
 # ADD SWAP
 #=================================================
 
-if [ "${PACKAGE_CHECK_EXEC:-0}" -ne 1 ]; then
-    ynh_script_progression --message="Adding swap..." --weight=1
-    ynh_add_swap --size=$swap_needed
-fi
+# if [ "${PACKAGE_CHECK_EXEC:-0}" -ne 1 ]; then
+#     ynh_script_progression --message="Adding swap..." --weight=1
+#     ynh_add_swap --size=$swap_needed
+# fi
 
 #=================================================
 # RESTORE THE APP MAIN DIR
diff --git a/scripts/upgrade b/scripts/upgrade
index 9ed854e..22862f6 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -25,10 +25,10 @@ ynh_systemd_action --service_name="$app" --action="stop" --log_path="/var/log/$a
 # ADD SWAP
 #=================================================
 
-if [ "${PACKAGE_CHECK_EXEC:-0}" -ne 1 ]; then
-    ynh_script_progression --message="Adding swap..." --weight=1
-    ynh_add_swap --size=$swap_needed
-fi
+# if [ "${PACKAGE_CHECK_EXEC:-0}" -ne 1 ]; then
+#     ynh_script_progression --message="Adding swap..." --weight=1
+#     ynh_add_swap --size=$swap_needed
+# fi
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE