diff --git a/hiera.yaml b/hiera.yaml
index 545fff327..173556f06 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -11,8 +11,6 @@ hierarchy:
         # Used to distinguish between Debian and Ubuntu
       - "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
       - "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
-        # Used for Solaris
-      - "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
   - name: "osfamily"
     paths:
       - "os/%{facts.os.name}.yaml"
diff --git a/manifests/params.pp b/manifests/params.pp
index 4e557d550..70442749a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -363,33 +363,6 @@
       $daemon_dev_package_name     = undef
     }
 
-    'Solaris': {
-      $client_package_name = 'database/mysql-55/client'
-      $server_package_name = 'database/mysql-55'
-      $basedir             = undef
-      $config_file         = '/etc/mysql/5.5/my.cnf'
-      $datadir             = '/var/mysql/5.5/data'
-      $log_error           = "/var/mysql/5.5/data/${::hostname}.err"
-      $pidfile             = "/var/mysql/5.5/data/${::hostname}.pid"
-      $root_group          = 'bin'
-      $server_service_name = 'application/database/mysql:version_55'
-      $socket              = '/tmp/mysql.sock'
-      $ssl_ca              = undef
-      $ssl_cert            = undef
-      $ssl_key             = undef
-      $tmpdir              = '/tmp'
-      $managed_dirs        = undef
-      # mysql::bindings
-      $java_package_name   = undef
-      $perl_package_name   = undef
-      $php_package_name    = 'web/php-53/extension/php-mysql'
-      $python_package_name = 'library/python/python-mysql'
-      $ruby_package_name   = undef
-      # The libraries installed by these packages are included in client and server packages, no installation required.
-      $client_dev_package_name     = undef
-      $daemon_dev_package_name     = undef
-    }
-
     default: {
       case $::operatingsystem {
         'Alpine': {
diff --git a/templates/mysqlbackup.sh.erb b/templates/mysqlbackup.sh.erb
index d90d56779..12ed05273 100755
--- a/templates/mysqlbackup.sh.erb
+++ b/templates/mysqlbackup.sh.erb
@@ -22,11 +22,7 @@ ROTATE=<%= [ Integer(@backuprotate) - 1, 0 ].max %>
 
 # Create temporary mysql cnf file.
 TMPFILE=`mktemp /tmp/backup.XXXXXX` || exit 1
-<%- if @kernel == 'SunOS' -%>
-echo "[client]\npassword=$PASS\nuser=$USER\nmax_allowed_packet=$MAX_ALLOWED_PACKET" > $TMPFILE
-<%- else -%>
 echo -e "[client]\npassword=$PASS\nuser=$USER\nmax_allowed_packet=$MAX_ALLOWED_PACKET" > $TMPFILE
-<%- end -%>
 
 <% if @prescript -%>
 <%- [@prescript].flatten.compact.each do |script|%>
@@ -76,11 +72,7 @@ set -o pipefail
 
 cleanup()
 {
-<%- if @kernel == 'SunOS' -%>
-	gfind "${DIR}/" -maxdepth 1 -type f -name "${PREFIX}*.sql*" -mtime +${ROTATE} -print0 | gxargs -0 -r rm -f
-<%- else -%>
 	find "${DIR}/" -maxdepth 1 -type f -name "${PREFIX}*.sql*" -mtime +${ROTATE} -print0 | xargs -0 -r rm -f
-<%- end -%>
 }
 
 <% if @delete_before_dump -%>
diff --git a/templates/xtrabackup.sh.erb b/templates/xtrabackup.sh.erb
index c3d66bf00..19b6ad753 100644
--- a/templates/xtrabackup.sh.erb
+++ b/templates/xtrabackup.sh.erb
@@ -25,11 +25,7 @@ set -o pipefail
 
 cleanup()
 {
-  <%- if @kernel == 'SunOS' -%>
-    gfind "${DIR}/" -mindepth 1 -maxdepth 1 -mtime +${ROTATE} -print0 | gxargs -0 -r rm -rf
-  <%- else -%>
     find "${DIR}/" -mindepth 1 -maxdepth 1 -mtime +${ROTATE} -print0 | xargs -0 -r rm -rf
-  <%- end -%>
 }
 
 <% if @delete_before_dump -%>