diff --git a/README.md b/README.md
index 3537eb7..53738ea 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,7 @@ or from the Web administration:
 
 ## TODO
 
- * Test the upgrade from the current official package
  * Update `config.php` and `config.system.php` at upgrade
- * Add a PHP-FPM pool for Baïkal?
 
 ## Links ##
 
diff --git a/scripts/backup b/scripts/backup
index 9cf96c3..d0fb5e7 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -22,7 +22,6 @@ ynh_backup "$DESTDIR" "sources"
 
 # Copy the conf files
 ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf" "nginx.conf"
-#ynh_backup "/etc/php5/fpm/pool.d/${app}.conf" "php-fpm.conf"
 
 # Dump the database
 mysqldump -u "$dbuser" -p"$dbpass" --no-create-db "$dbname" > ./dump.sql
diff --git a/scripts/install b/scripts/install
index 867a41c..30635e2 100644
--- a/scripts/install
+++ b/scripts/install
@@ -69,14 +69,6 @@ sed -i "s@#LOCATION#@${path:-/}@g" ../conf/nginx.conf
 sed -i "s@#DESTDIR#@${DESTDIR}@g"  ../conf/nginx.conf
 sudo cp ../conf/nginx.conf "$nginx_conf"
 
-# Copy and set php-fpm configuration
-#phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf"
-#sed -i "s@#POOLNAME#@${app}@g"     ../conf/php-fpm.conf
-#sed -i "s@#DESTDIR#@${DESTDIR}/@g" ../conf/php-fpm.conf
-#sudo cp ../conf/php-fpm.conf "$phpfpm_conf"
-#sudo chown root: $phpfpm_conf
-#sudo chmod 644 $phpfpm_conf
-
 # Save app settings
 ynh_app_setting_set "$app" password "$password"
 ynh_app_setting_set "$app" encrypt_key "$deskey"
@@ -87,5 +79,4 @@ ynh_app_setting_set "$app" skipped_uris "/"
 ynh_app_setting_set "$app" protected_uris "/admin/"
 
 # Reload services
-#sudo service php5-fpm restart || true
 sudo service nginx reload || true
diff --git a/scripts/remove b/scripts/remove
index c83ac19..19f22e6 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -19,9 +19,7 @@ domain=$(ynh_app_setting_get $app domain)
 
 # Delete app directory and configurations
 sudo rm -rf "/var/www/${app}"
-#sudo rm -f "/etc/php5/fpm/pool.d/${app}.conf"
 [[ -n $domain ]] && sudo rm -f "/etc/nginx/conf.d/${domain}.d/${app}.conf"
 
 # Reload services
-#sudo service php5-fpm restart || true
 sudo service nginx reload || true
diff --git a/scripts/restore b/scripts/restore
index 09b9982..4e6184f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -31,10 +31,6 @@ nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf"
 [[ -f $nginx_conf ]] && ynh_die \
 "The NGINX configuration already exists at '${nginx_conf}'.
  You should safely delete it before restoring this app."
-#phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf"
-#[[ -f $phpfpm_conf ]] && ynh_die \
-#"The PHP FPM configuration already exists at '${phpfpm_conf}'.
-# You should safely delete it before restoring this app."
 
 # Restore the app files and set permissions
 sudo cp -a ./sources "$DESTDIR"
@@ -46,8 +42,6 @@ ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" < ./dump.sql
 
 # Restore configuration files
 sudo cp -a ./nginx.conf   "$nginx_conf"
-#sudo cp -a ./php-fpm.conf "$phpfpm_conf"
 
 # Reload services
-#sudo service php5-fpm restart || true
 sudo service nginx reload || true
diff --git a/scripts/upgrade b/scripts/upgrade
index 7322907..e7b3dff 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -50,18 +50,9 @@ sed -i "s@#LOCATION#@${path:-/}@g" ../conf/nginx.conf
 sed -i "s@#DESTDIR#@${DESTDIR}@g"  ../conf/nginx.conf
 sudo cp ../conf/nginx.conf "$nginx_conf"
 
-# Copy and set php-fpm configuration
-#phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf"
-#sed -i "s@#POOLNAME#@${app}@g"     ../conf/php-fpm.conf
-#sed -i "s@#DESTDIR#@${DESTDIR}/@g" ../conf/php-fpm.conf
-#sudo cp ../conf/php-fpm.conf "$phpfpm_conf"
-#sudo chown root: $phpfpm_conf
-#sudo chmod 644 $phpfpm_conf
-
 # Set SSOwat rules
 ynh_app_setting_set "$app" skipped_uris "/"
 ynh_app_setting_set "$app" protected_uris "/admin/"
 
 # Reload services
-#sudo service php5-fpm restart || true
 sudo service nginx reload || true