diff --git a/FEATURES.md b/FEATURES.md
index 5b78c1c..437e475 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -20,10 +20,8 @@ Features list for option: --feature (dev only)
 * get_all_vars
 * get_basic_passwords
 * get_file_contents
-* get_fs_info
 * get_gcache_memory
 * get_http_cli
-* get_kernel_info
 * get_log_file_real_path
 * get_opened_ports
 * get_os_release
@@ -31,29 +29,13 @@ Features list for option: --feature (dev only)
 * get_pf_memory
 * get_process_memory
 * get_replication_status
-* get_system_info
-* get_tuning_info
 * get_wsrep_option
 * get_wsrep_options
 * goodprint
 * greenwrap
 * grep_file_contents
 * headerprint
-* hr_bytes
-* hr_bytes_rnd
-* hr_num
-* hr_raw
 * human_size
-* infocmd
-* infocmd_one
-* infocmd_tab
-* infoprint
-* infoprintcmd
-* infoprinthcmd
-* infoprintml
-* is_open_port
-* is_remote()
-* is_virtual_machine
 * log_file_recommendations
 * make_recommendations
 * mariadb_aria
diff --git a/build/genFeatures.sh b/build/genFeatures.sh
new file mode 100644
index 0000000..13f91bc
--- /dev/null
+++ b/build/genFeatures.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Update Feature list
+(
+    echo -e "Features list for option: --feature (dev only)\n---\n\n"
+    grep -E '^sub ' ../mysqltuner.pl | \
+    perl -pe 's/sub //;s/\s*\{//g'| \
+    sort -n | \
+    perl -pe 's/^/* /g' | \
+    grep -vE '(is_|hr_|info)'
+) > ../FEATURES.md
+
diff --git a/build/updateStaff.sh b/build/updateStaff.sh
index c35cced..790902f 100644
--- a/build/updateStaff.sh
+++ b/build/updateStaff.sh
@@ -11,12 +11,10 @@ perl updateCVElist.pl
 dos2unix ../mysqltuner.pl
 
 # Update Feature list
-(
-    echo -e "Features list for option: --feature (dev only)\n---\n\n"
-    grep -E '^sub ' ../mysqltuner.pl | perl -pe 's/sub //;s/\s*\{//g'| sort -n | perl -pe 's/^/* /g'
-) > ../FEATURES.md
+bash ./genFeatures.sh
 
 git add ../vulnerabilities.csv ../mysqltuner.pl ../USAGE.md ../FEATURES.md
-#git commit -m 'Update Vulnerabilities list
-#Indenting mysqltuner
-#Update Usage information'
+git commit -m 'Update Vulnerabilities list
+Indenting mysqltuner
+Update Usage information
+Regenerate fetures list'