diff --git a/.github/workflows/code-coverage-test.yml b/.github/workflows/code-coverage-test.yml
index 77b0c35..b3ea0d8 100644
--- a/.github/workflows/code-coverage-test.yml
+++ b/.github/workflows/code-coverage-test.yml
@@ -29,8 +29,7 @@ jobs:
            /etc/postgresql
           sudo rm -f /usr/bin/pg_config
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
-          sudo /usr/bin/perl -MCPAN -e 'install String::Util'
-          sudo /usr/bin/perl -MCPAN -e 'install Data::Str2Num'
+          sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 
       - name: Create pgsql dir
         run: mkdir -p /opt/pgsql
diff --git a/.github/workflows/postgresql-12-build.yml b/.github/workflows/postgresql-12-build.yml
index a51b214..9319984 100644
--- a/.github/workflows/postgresql-12-build.yml
+++ b/.github/workflows/postgresql-12-build.yml
@@ -28,8 +28,7 @@ jobs:
            /etc/postgresql
           sudo rm -f /usr/bin/pg_config
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
-          sudo /usr/bin/perl -MCPAN -e 'install String::Util'
-          sudo /usr/bin/perl -MCPAN -e 'install Data::Str2Num'
+          sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 
       - name: Create pgsql dir
         run: mkdir -p /opt/pgsql
diff --git a/.github/workflows/postgresql-12-pgdg-package.yml b/.github/workflows/postgresql-12-pgdg-package.yml
index a43014b..2379ede 100644
--- a/.github/workflows/postgresql-12-pgdg-package.yml
+++ b/.github/workflows/postgresql-12-pgdg-package.yml
@@ -24,8 +24,7 @@ jobs:
             /etc/postgresql
           sudo rm -f /usr/bin/pg_config
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
-          sudo /usr/bin/perl -MCPAN -e 'install String::Util'
-          sudo /usr/bin/perl -MCPAN -e 'install Data::Str2Num'
+          sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 
       - name: Install PG Distribution Postgresql 12
         run: |
diff --git a/.github/workflows/postgresql-12-ppg-package.yml b/.github/workflows/postgresql-12-ppg-package.yml
index fbd524b..3c5e936 100644
--- a/.github/workflows/postgresql-12-ppg-package.yml
+++ b/.github/workflows/postgresql-12-ppg-package.yml
@@ -27,8 +27,7 @@ jobs:
             /etc/postgresql
           sudo rm -f /usr/bin/pg_config
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
-          sudo /usr/bin/perl -MCPAN -e 'install String::Util'
-          sudo /usr/bin/perl -MCPAN -e 'install Data::Str2Num'
+          sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 
       - name: Install percona-release script
         run: |
diff --git a/.github/workflows/postgresql-13-build.yml b/.github/workflows/postgresql-13-build.yml
index 19a5aca..16fe0a9 100644
--- a/.github/workflows/postgresql-13-build.yml
+++ b/.github/workflows/postgresql-13-build.yml
@@ -28,8 +28,7 @@ jobs:
            /etc/postgresql
           sudo rm -f /usr/bin/pg_config
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
-          sudo /usr/bin/perl -MCPAN -e 'install String::Util'
-          sudo /usr/bin/perl -MCPAN -e 'install Data::Str2Num'
+          sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 
       - name: Create pgsql dir
         run: mkdir -p /opt/pgsql
diff --git a/.github/workflows/postgresql-13-pgdg-package.yml b/.github/workflows/postgresql-13-pgdg-package.yml
index 8db3044..a7345db 100644
--- a/.github/workflows/postgresql-13-pgdg-package.yml
+++ b/.github/workflows/postgresql-13-pgdg-package.yml
@@ -24,8 +24,7 @@ jobs:
             /etc/postgresql
           sudo rm -f /usr/bin/pg_config
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
-          sudo /usr/bin/perl -MCPAN -e 'install String::Util'
-          sudo /usr/bin/perl -MCPAN -e 'install Data::Str2Num'
+          sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 
       - name: Install PG Distribution Postgresql 13
         run: |
diff --git a/.github/workflows/postgresql-13-ppg-package.yml b/.github/workflows/postgresql-13-ppg-package.yml
index aa3ba4a..0f6fd88 100644
--- a/.github/workflows/postgresql-13-ppg-package.yml
+++ b/.github/workflows/postgresql-13-ppg-package.yml
@@ -24,8 +24,7 @@ jobs:
             /etc/postgresql
           sudo rm -f /usr/bin/pg_config
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
-          sudo /usr/bin/perl -MCPAN -e 'install String::Util'
-          sudo /usr/bin/perl -MCPAN -e 'install Data::Str2Num'
+          sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 
       - name: Install percona-release script
         run: |
diff --git a/.github/workflows/postgresql-14-build.yml b/.github/workflows/postgresql-14-build.yml
index 75166c2..4aa39bc 100644
--- a/.github/workflows/postgresql-14-build.yml
+++ b/.github/workflows/postgresql-14-build.yml
@@ -29,8 +29,7 @@ jobs:
            /etc/postgresql
           sudo rm -f /usr/bin/pg_config
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
-          sudo /usr/bin/perl -MCPAN -e 'install String::Util'
-          sudo /usr/bin/perl -MCPAN -e 'install Data::Str2Num'
+          sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 
       - name: Create pgsql dir
         run: mkdir -p /opt/pgsql
diff --git a/.github/workflows/postgresql-14-pgdg-package.yml b/.github/workflows/postgresql-14-pgdg-package.yml
index 6c8c904..d19db89 100644
--- a/.github/workflows/postgresql-14-pgdg-package.yml
+++ b/.github/workflows/postgresql-14-pgdg-package.yml
@@ -23,8 +23,7 @@ jobs:
             /etc/postgresql
           sudo rm -f /usr/bin/pg_config
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
-          sudo /usr/bin/perl -MCPAN -e 'install String::Util'
-          sudo /usr/bin/perl -MCPAN -e 'install Data::Str2Num'
+          sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 
       - name: Install PG Distribution Postgresql 14
         run: |
diff --git a/.github/workflows/postgresql-14-ppg-package.yml b/.github/workflows/postgresql-14-ppg-package.yml
index 8fa4948..e95c24f 100644
--- a/.github/workflows/postgresql-14-ppg-package.yml
+++ b/.github/workflows/postgresql-14-ppg-package.yml
@@ -24,8 +24,7 @@ jobs:
             /etc/postgresql
           sudo rm -f /usr/bin/pg_config
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
-          sudo /usr/bin/perl -MCPAN -e 'install String::Util'
-          sudo /usr/bin/perl -MCPAN -e 'install Data::Str2Num'
+          sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 
       - name: Install percona-release script
         run: |
diff --git a/.github/workflows/postgresql-15-build.yml b/.github/workflows/postgresql-15-build.yml
index 89abf8d..113152d 100644
--- a/.github/workflows/postgresql-15-build.yml
+++ b/.github/workflows/postgresql-15-build.yml
@@ -29,8 +29,7 @@ jobs:
            /etc/postgresql
           sudo rm -f /usr/bin/pg_config
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
-          sudo /usr/bin/perl -MCPAN -e 'install String::Util'
-          sudo /usr/bin/perl -MCPAN -e 'install Data::Str2Num'
+          sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 
       - name: Create pgsql dir
         run: mkdir -p /opt/pgsql
diff --git a/.github/workflows/postgresql-15-pgdg-package.yml b/.github/workflows/postgresql-15-pgdg-package.yml
index 15b9618..0463647 100644
--- a/.github/workflows/postgresql-15-pgdg-package.yml
+++ b/.github/workflows/postgresql-15-pgdg-package.yml
@@ -23,8 +23,7 @@ jobs:
             /etc/postgresql
           sudo rm -f /usr/bin/pg_config
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
-          sudo /usr/bin/perl -MCPAN -e 'install String::Util'
-          sudo /usr/bin/perl -MCPAN -e 'install Data::Str2Num'
+          sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 
       - name: Install PG Distribution Postgresql 15
         run: |
diff --git a/.github/workflows/postgresql-15-ppg-package.yml b/.github/workflows/postgresql-15-ppg-package.yml
index b19fc2d..1341026 100644
--- a/.github/workflows/postgresql-15-ppg-package.yml
+++ b/.github/workflows/postgresql-15-ppg-package.yml
@@ -24,8 +24,7 @@ jobs:
             /etc/postgresql
           sudo rm -f /usr/bin/pg_config
           sudo /usr/bin/perl -MCPAN -e 'install IPC::RUN'
-          sudo /usr/bin/perl -MCPAN -e 'install String::Util'
-          sudo /usr/bin/perl -MCPAN -e 'install Data::Str2Num'
+          sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 
       - name: Install percona-release script
         run: |
diff --git a/t/001_settings_default.pl b/t/001_settings_default.pl
index 8f8e372..8722281 100644
--- a/t/001_settings_default.pl
+++ b/t/001_settings_default.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/002_settings_pgsm_track_planning.pl b/t/002_settings_pgsm_track_planning.pl
index c053c8b..41f12b8 100644
--- a/t/002_settings_pgsm_track_planning.pl
+++ b/t/002_settings_pgsm_track_planning.pl
@@ -5,7 +5,7 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
+use Text::Trim qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/003_settings_pgms_extract_comments.pl b/t/003_settings_pgms_extract_comments.pl
index 02c6355..3e24adb 100644
--- a/t/003_settings_pgms_extract_comments.pl
+++ b/t/003_settings_pgms_extract_comments.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/004_settings_pgsm_track.pl b/t/004_settings_pgsm_track.pl
index 4b189a1..31b6390 100644
--- a/t/004_settings_pgsm_track.pl
+++ b/t/004_settings_pgsm_track.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/005_settings_pgsm_enable_query_plan.pl b/t/005_settings_pgsm_enable_query_plan.pl
index 195bc06..6d551da 100644
--- a/t/005_settings_pgsm_enable_query_plan.pl
+++ b/t/005_settings_pgsm_enable_query_plan.pl
@@ -5,7 +5,7 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
+use Text::Trim qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/006_settings_pgsm_overflow_target.pl b/t/006_settings_pgsm_overflow_target.pl
index 4b357bd..5b8bad6 100644
--- a/t/006_settings_pgsm_overflow_target.pl
+++ b/t/006_settings_pgsm_overflow_target.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/007_settings_pgsm_query_shared_buffer.pl b/t/007_settings_pgsm_query_shared_buffer.pl
index 79cbf46..432e879 100644
--- a/t/007_settings_pgsm_query_shared_buffer.pl
+++ b/t/007_settings_pgsm_query_shared_buffer.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/008_settings_pgsm_histogram_buckets.pl b/t/008_settings_pgsm_histogram_buckets.pl
index 812f608..bbd7a26 100644
--- a/t/008_settings_pgsm_histogram_buckets.pl
+++ b/t/008_settings_pgsm_histogram_buckets.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/009_settings_pgsm_histogram_max.pl b/t/009_settings_pgsm_histogram_max.pl
index 884a860..84b7134 100644
--- a/t/009_settings_pgsm_histogram_max.pl
+++ b/t/009_settings_pgsm_histogram_max.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/010_settings_pgsm_histogram_min.pl b/t/010_settings_pgsm_histogram_min.pl
index 01d7d9f..b480be3 100644
--- a/t/010_settings_pgsm_histogram_min.pl
+++ b/t/010_settings_pgsm_histogram_min.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/011_settings_pgsm_bucket_time.pl b/t/011_settings_pgsm_bucket_time.pl
index 50f7b2e..b7d930f 100644
--- a/t/011_settings_pgsm_bucket_time.pl
+++ b/t/011_settings_pgsm_bucket_time.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/012_settings_pgsm_max_buckets.pl b/t/012_settings_pgsm_max_buckets.pl
index 00e56c0..0c1d425 100644
--- a/t/012_settings_pgsm_max_buckets.pl
+++ b/t/012_settings_pgsm_max_buckets.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/013_settings_pgsm_normalized_query.pl b/t/013_settings_pgsm_normalized_query.pl
index b08150b..2d5ffaa 100644
--- a/t/013_settings_pgsm_normalized_query.pl
+++ b/t/013_settings_pgsm_normalized_query.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/014_settings_pgsm_track_utility.pl b/t/014_settings_pgsm_track_utility.pl
index 13546c5..d8f2389 100644
--- a/t/014_settings_pgsm_track_utility.pl
+++ b/t/014_settings_pgsm_track_utility.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/015_settings_pgsm_query_max_len.pl b/t/015_settings_pgsm_query_max_len.pl
index 43decf3..310d28f 100644
--- a/t/015_settings_pgsm_query_max_len.pl
+++ b/t/015_settings_pgsm_query_max_len.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/016_settings_pgsm_max.pl b/t/016_settings_pgsm_max.pl
index 4ae476e..ba67310 100644
--- a/t/016_settings_pgsm_max.pl
+++ b/t/016_settings_pgsm_max.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/017_execution_stats.pl b/t/017_execution_stats.pl
index 6775e60..5d4abcc 100644
--- a/t/017_execution_stats.pl
+++ b/t/017_execution_stats.pl
@@ -5,7 +5,7 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
+use Text::Trim qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/018_column_names.pl b/t/018_column_names.pl
index aeaee9e..584b9d8 100644
--- a/t/018_column_names.pl
+++ b/t/018_column_names.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/019_insufficient_shared_space.pl b/t/019_insufficient_shared_space.pl
index 35fd78e..e06d8df 100644
--- a/t/019_insufficient_shared_space.pl
+++ b/t/019_insufficient_shared_space.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/020_buffer_overflow.pl b/t/020_buffer_overflow.pl
index 5887441..b4cd4db 100644
--- a/t/020_buffer_overflow.pl
+++ b/t/020_buffer_overflow.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/021_misc_1.pl b/t/021_misc_1.pl
index b48781a..f3ce588 100644
--- a/t/021_misc_1.pl
+++ b/t/021_misc_1.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/022_misc_2.pl b/t/022_misc_2.pl
index a36866a..7b247ac 100644
--- a/t/022_misc_2.pl
+++ b/t/022_misc_2.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/024_check_timings.pl b/t/024_check_timings.pl
index d2e4962..a5888ef 100644
--- a/t/024_check_timings.pl
+++ b/t/024_check_timings.pl
@@ -5,7 +5,7 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
+use Text::Trim qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/025_compare_pgss.pl b/t/025_compare_pgss.pl
index 83e8e26..05f940a 100644
--- a/t/025_compare_pgss.pl
+++ b/t/025_compare_pgss.pl
@@ -5,7 +5,7 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
+use Text::Trim qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/026_shared_blocks.pl b/t/026_shared_blocks.pl
index 7a4c628..b2158c5 100644
--- a/t/026_shared_blocks.pl
+++ b/t/026_shared_blocks.pl
@@ -5,7 +5,7 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
+use Text::Trim qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/027_local_blocks.pl b/t/027_local_blocks.pl
index 0422483..3c33adc 100644
--- a/t/027_local_blocks.pl
+++ b/t/027_local_blocks.pl
@@ -5,7 +5,7 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
+use Text::Trim qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/028_temp_block.pl b/t/028_temp_block.pl
index 2fa69e7..27db3ce 100644
--- a/t/028_temp_block.pl
+++ b/t/028_temp_block.pl
@@ -5,7 +5,7 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
+use Text::Trim qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/029_bucket_done.pl b/t/029_bucket_done.pl
index e6c6dd1..d137668 100644
--- a/t/029_bucket_done.pl
+++ b/t/029_bucket_done.pl
@@ -5,7 +5,6 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/030_histogram.pl b/t/030_histogram.pl
index 259544d..ef22063 100644
--- a/t/030_histogram.pl
+++ b/t/030_histogram.pl
@@ -5,7 +5,7 @@ use warnings;
 use File::Basename;
 use File::Compare;
 use File::Copy;
-use String::Util qw(trim);
+use Text::Trim qw(trim);
 use Test::More;
 use lib 't';
 use pgsm;
diff --git a/t/pgsm.pm b/t/pgsm.pm
index d047fa1..d5545c0 100644
--- a/t/pgsm.pm
+++ b/t/pgsm.pm
@@ -1,6 +1,5 @@
 package PGSM;
 
-use String::Util qw(trim);
 use File::Basename;
 use File::Compare;
 use Test::More;