diff --git a/manifests/config.pp b/manifests/config.pp
index 3c710c3..e631ee8 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -21,12 +21,10 @@
 #   or Puppet catalog compilation will fail with duplicate resources.
 #
 class watcher::config (
-  $watcher_config = {},
+  Hash $watcher_config = {},
 ) {
 
   include watcher::deps
 
-  validate_legacy(Hash, 'validate_hash', $watcher_config)
-
   create_resources('watcher_config', $watcher_config)
 }
diff --git a/manifests/cron/db_purge.pp b/manifests/cron/db_purge.pp
index 7d36fe6..274c71a 100644
--- a/manifests/cron/db_purge.pp
+++ b/manifests/cron/db_purge.pp
@@ -69,21 +69,19 @@
 #
 class watcher::cron::db_purge (
   Enum['present', 'absent'] $ensure = 'present',
-  $minute          = 1,
-  $hour            = 0,
-  $monthday        = '*',
-  $month           = '*',
-  $weekday         = '*',
-  $user            = $::watcher::params::user,
-  $age             = 30,
-  $destination     = '/var/log/watcher/watcher-rowsflush.log',
-  $maxdelay        = 0,
-  $exclude_orphans = false,
-  $max_number      = undef,
+  $minute                           = 1,
+  $hour                             = 0,
+  $monthday                         = '*',
+  $month                            = '*',
+  $weekday                          = '*',
+  $user                             = $::watcher::params::user,
+  $age                              = 30,
+  $destination                      = '/var/log/watcher/watcher-rowsflush.log',
+  $maxdelay                         = 0,
+  Boolean $exclude_orphans          = false,
+  $max_number                       = undef,
 ) inherits watcher::params {
 
-  validate_legacy(Boolean, 'validate_bool', $exclude_orphans)
-
   include watcher::deps
 
   $sleep = $maxdelay ? {
diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index ad72a25..f01ac27 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -34,7 +34,7 @@
 #   Defaults to 'utf8_general_ci'
 #
 class watcher::db::mysql(
-  $password,
+  String[1] $password,
   $dbname        = 'watcher',
   $user          = 'watcher',
   $host          = '127.0.0.1',
@@ -45,8 +45,6 @@ class watcher::db::mysql(
 
   include watcher::deps
 
-  validate_legacy(String, 'validate_string', $password)
-
   ::openstacklib::db::mysql { 'watcher':
     user          => $user,
     password      => $password,
diff --git a/manifests/decision_engine.pp b/manifests/decision_engine.pp
index 414e4d5..4a2cb99 100644
--- a/manifests/decision_engine.pp
+++ b/manifests/decision_engine.pp
@@ -53,8 +53,8 @@
 #
 class watcher::decision_engine (
   $package_ensure                      = 'present',
-  $enabled                             = true,
-  $manage_service                      = true,
+  Boolean $enabled                     = true,
+  Boolean $manage_service              = true,
   $decision_engine_conductor_topic     = $facts['os_service_default'],
   $decision_engine_status_topic        = $facts['os_service_default'],
   $decision_engine_notification_topics = $facts['os_service_default'],
diff --git a/manifests/policy.pp b/manifests/policy.pp
index 1d67e2f..d566043 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -48,7 +48,7 @@
 class watcher::policy (
   $enforce_scope        = $facts['os_service_default'],
   $enforce_new_defaults = $facts['os_service_default'],
-  $policies             = {},
+  Hash $policies        = {},
   $policy_path          = '/etc/watcher/policy.yaml',
   $policy_default_rule  = $facts['os_service_default'],
   $policy_dirs          = $facts['os_service_default'],
@@ -58,8 +58,6 @@ class watcher::policy (
   include watcher::deps
   include watcher::params
 
-  validate_legacy(Hash, 'validate_hash', $policies)
-
   $policy_parameters = {
     policies     => $policies,
     policy_path  => $policy_path,