diff --git a/dbcon/mysql/columnstore.cnf b/dbcon/mysql/columnstore.cnf
index 81c3d0be0..19840e129 100644
--- a/dbcon/mysql/columnstore.cnf
+++ b/dbcon/mysql/columnstore.cnf
@@ -1,6 +1,6 @@
 [mysqld]
 plugin-load-add=ha_columnstore.so
-plugin-maturity=gamma
+plugin-maturity=beta
 
 # Enable compression by default on create, set to NONE to turn off
 #columnstore_compression_type=SNAPPY
diff --git a/dbcon/mysql/install_mcs_mysql.sh.in b/dbcon/mysql/install_mcs_mysql.sh.in
index 88a44d0b4..92492a61e 100755
--- a/dbcon/mysql/install_mcs_mysql.sh.in
+++ b/dbcon/mysql/install_mcs_mysql.sh.in
@@ -19,6 +19,9 @@ fi
 # DELETE libcalmysql.so entries first as they are in ha_columnstore.so in 1.4.2 onwards
 $MDB 2> ${tmpdir}/mysql_install.log <<EOD
 DELETE FROM mysql.func WHERE dl='libcalmysql.so';
+DELETE FROM mysql.func WHERE dl='ha_columnstore.so';
+DELETE FROM mysql.func WHERE dl='libregr_mysql.so';
+DELETE FROM mysql.func WHERE dl='libudf_mysql.so';
 INSERT INTO mysql.func VALUES ('calgetstats',0,'ha_columnstore.so','function');
 INSERT INTO mysql.func VALUES ('calsettrace',2,'ha_columnstore.so','function');
 INSERT INTO mysql.func VALUES ('calsetparms',0,'ha_columnstore.so','function');
diff --git a/oam/install_scripts/columnstore-pre-uninstall.in b/oam/install_scripts/columnstore-pre-uninstall.in
index 71da0bc10..a23fe2138 100755
--- a/oam/install_scripts/columnstore-pre-uninstall.in
+++ b/oam/install_scripts/columnstore-pre-uninstall.in
@@ -18,13 +18,17 @@ else
   MDB="/usr/bin/mysql"
 fi
 
-$MDB -e 'DROP DATABASE IF EXISTS infinidb_querystats;' 2>/dev/null
-$MDB -e 'DELETE FROM mysql.func WHERE dl="libcalmysql.so"' 2>/dev/null
-$MDB -e 'DROP DATABASE IF EXISTS calpontsys;' 2>/dev/null
-$MDB -e 'DROP PROCEDURE IF EXISTS infinidb_querystats.calSetUserPriority;' 2>/dev/null
-$MDB -e "DROP PROCEDURE IF EXISTS infinidb_querystats.calRemoveUserPriority(IN host VARCHAR(50), IN usr VARCHAR(50))" 2>/dev/null
-$MDB -e "DROP PROCEDURE IF EXISTS infinidb_querystats.calShowProcessList;" 2>/dev/null
-$MDB -e "DROP DATABASE IF EXISTS columnstore_info;" 2>/dev/null
+$MDB 2> ${tmpdir}/mysql_uninstall.log <<EOD
+DROP DATABASE IF EXISTS infinidb_querystats;
+DELETE FROM mysql.func WHERE dl="ha_columnstore.so";
+DELETE FROM mysql.func WHERE dl="libregr_mysql.so";
+DELETE FROM mysql.func WHERE dl="libudf_mysql.so";
+DROP DATABASE IF EXISTS calpontsys;
+DROP PROCEDURE IF EXISTS infinidb_querystats.calSetUserPriority;
+DROP PROCEDURE IF EXISTS infinidb_querystats.calRemoveUserPriority(IN host VARCHAR(50), IN usr VARCHAR(50));
+DROP PROCEDURE IF EXISTS infinidb_querystats.calShowProcessList;
+DROP DATABASE IF EXISTS columnstore_info;
+EOD
 
 # Test we are using systemd
 systemctl cat mariadb-columnstore.service > /dev/null 2>&1