diff --git a/content/automate/ManageIQ/Infrastructure/Host/Lifecycle.class/__class__.yaml b/content/automate/ManageIQ/Infrastructure/Host/Lifecycle.class/__class__.yaml
deleted file mode 100644
index 8051cb024..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Lifecycle.class/__class__.yaml
+++ /dev/null
@@ -1,613 +0,0 @@
----
-object_type: class
-version: 1.0
-object:
-  attributes:
-    description: 
-    display_name: 
-    name: Lifecycle
-    type: 
-    inherits: 
-    visibility: 
-    owner: 
-  schema:
-  - field:
-      aetype: assertion
-      name: guard
-      display_name: 
-      datatype: string
-      priority: 1
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: on_entry
-      display_name: 
-      datatype: string
-      priority: 2
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship1
-      display_name: 
-      datatype: string
-      priority: 3
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: Method1
-      display_name: 
-      datatype: string
-      priority: 4
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship2
-      display_name: 
-      datatype: string
-      priority: 5
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: Method2
-      display_name: 
-      datatype: string
-      priority: 6
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship3
-      display_name: 
-      datatype: string
-      priority: 7
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: Method3
-      display_name: 
-      datatype: string
-      priority: 8
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship4
-      display_name: 
-      datatype: string
-      priority: 9
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: Method4
-      display_name: 
-      datatype: string
-      priority: 10
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship5
-      display_name: 
-      datatype: string
-      priority: 11
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: Method5
-      display_name: 
-      datatype: string
-      priority: 12
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship6
-      display_name: 
-      datatype: string
-      priority: 13
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: Method6
-      display_name: 
-      datatype: string
-      priority: 14
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship7
-      display_name: 
-      datatype: string
-      priority: 15
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: Method7
-      display_name: 
-      datatype: string
-      priority: 16
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship8
-      display_name: 
-      datatype: string
-      priority: 17
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: Method8
-      display_name: 
-      datatype: string
-      priority: 18
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship9
-      display_name: 
-      datatype: string
-      priority: 19
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: Method9
-      display_name: 
-      datatype: string
-      priority: 20
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship10
-      display_name: 
-      datatype: string
-      priority: 21
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: Method10
-      display_name: 
-      datatype: string
-      priority: 22
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship11
-      display_name: 
-      datatype: string
-      priority: 23
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: Method11
-      display_name: 
-      datatype: string
-      priority: 24
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship12
-      display_name: 
-      datatype: string
-      priority: 25
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: Method12
-      display_name: 
-      datatype: string
-      priority: 26
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship13
-      display_name: 
-      datatype: string
-      priority: 27
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: Method13
-      display_name: 
-      datatype: string
-      priority: 28
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: relationship
-      name: Relationship14
-      display_name: 
-      datatype: string
-      priority: 29
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: on_exit
-      display_name: 
-      datatype: string
-      priority: 30
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Lifecycle.class/provisioning.yaml b/content/automate/ManageIQ/Infrastructure/Host/Lifecycle.class/provisioning.yaml
deleted file mode 100644
index 764b3c132..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Lifecycle.class/provisioning.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: Provisioning
-    inherits: 
-    description: 
-  fields:
-  - Relationship5:
-      value: "/Infrastructure/Host/Provisioning/Profile/${/#user.normalized_ldap_group}#get_state_machine"
-  - Relationship6:
-      value: "/Infrastructure/Host/Provisioning/StateMachines/${/#state_machine}/${/#miq_host_provision.provision_type}"
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Lifecycle.class/retirement.yaml b/content/automate/ManageIQ/Infrastructure/Host/Lifecycle.class/retirement.yaml
deleted file mode 100644
index caaade30e..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Lifecycle.class/retirement.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: Retirement
-    inherits: 
-    description: 
-  fields: []
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__class__.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__class__.yaml
deleted file mode 100644
index 5e075b1e6..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__class__.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
----
-object_type: class
-version: 1.0
-object:
-  attributes:
-    description: 
-    display_name: 
-    name: Email
-    type: 
-    inherits: 
-    visibility: 
-    owner: 
-  schema:
-  - field:
-      aetype: attribute
-      name: to_email_address
-      display_name: 
-      datatype: string
-      priority: 1
-      owner: 
-      default_value: evmadmin@example.com
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: attribute
-      name: from_email_address
-      display_name: 
-      datatype: string
-      priority: 2
-      owner: 
-      default_value: evmadmin@example.com
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: attribute
-      name: signature
-      display_name: 
-      datatype: string
-      priority: 3
-      owner: 
-      default_value: Virtualization Infrastructure Team
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: attribute
-      name: vm_retire_extend_days
-      display_name: 
-      datatype: string
-      priority: 4
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: method1
-      display_name: 
-      datatype: string
-      priority: 5
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__methods__/miqhostprovision_complete.rb b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__methods__/miqhostprovision_complete.rb
deleted file mode 100644
index fe85f28f2..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__methods__/miqhostprovision_complete.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Description: This method sends an e-mail when the following event is raised:
-#
-# Events: host_provisioned
-# Model Notes:
-# 1. to_email_address - used to specify an email address in the case where the
-#    host's owner does not have an  email address. To specify more than one email
-#    address separate email address with commas. (I.e. admin@example.com,user@example.com)
-# 2. from_email_address - used to specify an email address in the event the
-#    requester replies to the email
-# 3. signature - used to stamp the email with a custom signature
-#
-
-# Get the provisioning object
-prov = $evm.root['miq_host_provision_request'] || $evm.root['miq_host_provision']
-host = prov.host
-raise "Host not found" if host.nil?
-
-hostname = prov.get_option(:hostname)
-hostid = prov.get_option(:src_host_ids)
-
-# Override the default appliance IP Address below
-appliance ||= $evm.root['miq_server'].ipaddress
-
-$evm.log("info", "Inspecting Host Object: #{host.inspect}")
-
-# Get Host Owner Email
-owner = nil
-owner ||= prov.get_option(:owner_email)
-$evm.log("info", "Host Owner: #{owner.inspect}")
-
-# to_email_address from owner.email then from model if nil
-to = owner || $evm.object['to_email_address']
-
-# Get from_email_address from model unless specified below
-from = nil
-from ||= $evm.object['from_email_address']
-
-# Get signature from model unless specified below
-signature = nil
-signature ||= $evm.object['signature']
-
-# Set email Subject
-subject = "Your host provisioning request has Completed - Host: #{hostname}"
-
-# Set the opening body to Hello
-body = "Hello, "
-
-# Host Provisioned Email Body
-body += "<br><br>Your request to provision a host was approved and completed on #{Time.now.strftime('%A, %B %d, %Y at %I:%M%p')}. "
-body += "<br><br>Host: #{hostname}<b> will be available in approximately 15 minutes</b>. "
-body += "<br><br>If you are not already logged in, you can access and manage your host here <a href='https://#{appliance}/host/show/#{hostid}'>https://#{appliance}/host/show/#{hostid}</a>"
-body += "<br><br> If you have any issues with your new host please contact Support."
-body += "<br><br> Thank you,"
-body += "<br> #{signature}"
-
-$evm.log("info", "Sending email to <#{to}> from <#{from}> subject: <#{subject}>")
-$evm.execute('send_email', to, from, subject, body)
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__methods__/miqhostprovision_complete.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__methods__/miqhostprovision_complete.yaml
deleted file mode 100644
index 2ad51432d..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__methods__/miqhostprovision_complete.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: method
-version: 1.0
-object:
-  attributes:
-    name: MiqHostProvision_Complete
-    display_name: 
-    description: 
-    scope: instance
-    language: ruby
-    location: inline
-  inputs: []
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__methods__/miqhostprovisionrequest_approved.rb b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__methods__/miqhostprovisionrequest_approved.rb
deleted file mode 100644
index e927095d4..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__methods__/miqhostprovisionrequest_approved.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Description: This method is used to email the provision requester that the
-# Host provisioning request has been approved
-#
-# Events: request_approved
-# Model Notes:
-# 1. to_email_address - used to specify an email address in the case where the
-#    requester does not have a valid email address. To specify more than one email
-#    address separate email address with commas. (I.e. admin@example.com,user@example.com)
-# 2. from_email_address - used to specify an email address in the event the
-#    requester replies to the email
-# 3. signature - used to stamp the email with a custom signature
-#
-
-# Get variables
-miq_request = $evm.root["miq_request"]
-
-# Override the default appliance IP Address below
-appliance ||= $evm.root['miq_server'].ipaddress
-
-# Build email to requester with reason
-$evm.log('info', "Requester email logic starting")
-
-# Get requester email
-requester = $evm.root['miq_request'].requester
-
-# Get to_email_address from requester.email then from model if nil
-to = requester.email || $evm.object['to_email_address']
-
-# Get from_email_address from model unless specified below
-from = nil
-from ||= $evm.object['from_email_address']
-
-# Get signature from model unless specified below
-signature = nil
-signature ||= $evm.object['signature']
-
-# Build subject
-subject = "Request ID #{miq_request.id} - Your host provisioning request was Approved, pending Quota Validation"
-
-# Build email body
-body = "Hello, "
-body += "<br>Your host request was approved. If Quota validation is successful you will be notified via email when the host is available."
-body += "<br><br>To view this Request go to: <a href='https://#{appliance}/miq_request/show/#{miq_request.id}'>https://#{appliance}/miq_request/show/#{miq_request.id}</a>"
-body += "<br><br> Thank you,"
-body += "<br> #{signature}"
-
-$evm.log("info", "Sending email to <#{to}> from <#{from}> subject: <#{subject}>")
-$evm.execute(:send_email, to, from, subject, body)
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__methods__/miqhostprovisionrequest_approved.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__methods__/miqhostprovisionrequest_approved.yaml
deleted file mode 100644
index ad4b4282d..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/__methods__/miqhostprovisionrequest_approved.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: method
-version: 1.0
-object:
-  attributes:
-    name: MiqHostProvisionRequest_Approved
-    display_name: 
-    description: 
-    scope: instance
-    language: ruby
-    location: inline
-  inputs: []
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/miqhostprovision_complete.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/miqhostprovision_complete.yaml
deleted file mode 100644
index ca95fe3b9..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/miqhostprovision_complete.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: MiqHostProvision_Complete
-    inherits: 
-    description: 
-  fields:
-  - method1:
-      value: MiqHostProvision_Complete
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/miqhostprovisionrequest_approved.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/miqhostprovisionrequest_approved.yaml
deleted file mode 100644
index ab7c53a68..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Email.class/miqhostprovisionrequest_approved.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: MiqHostProvisionRequest_Approved
-    inherits: 
-    description: 
-  fields:
-  - method1:
-      value: MiqHostProvisionRequest_Approved
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/__class__.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/__class__.yaml
deleted file mode 100644
index 394b190da..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/__class__.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
----
-object_type: class
-version: 1.0
-object:
-  attributes:
-    description: 
-    display_name: 
-    name: Profile
-    type: 
-    inherits: 
-    visibility: 
-    owner: 
-  schema:
-  - field:
-      aetype: attribute
-      name: pre_dialog_name
-      display_name: 
-      datatype: string
-      priority: 1
-      owner: 
-      default_value: 
-      substitute: true
-      message: get_pre_dialog_name
-      visibility: 
-      collect: "/dialog_name = pre_dialog_name"
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: method
-      name: get_dialog_name
-      display_name: 
-      datatype: string
-      priority: 2
-      owner: 
-      default_value: 
-      substitute: true
-      message: get_state_machine
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: attribute
-      name: dialog_name
-      display_name: 
-      datatype: string
-      priority: 3
-      owner: 
-      default_value: miq_host_provision_dialogs
-      substitute: true
-      message: get_dialog_name
-      visibility: 
-      collect: "/dialog_name = dialog_name"
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
-  - field:
-      aetype: attribute
-      name: state_machine
-      display_name: 
-      datatype: string
-      priority: 4
-      owner: 
-      default_value: HostProvision
-      substitute: true
-      message: get_state_machine
-      visibility: 
-      collect: "/state_machine = state_machine"
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/__methods__/get_deploy_dialog.rb b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/__methods__/get_deploy_dialog.rb
deleted file mode 100644
index 3e5c23e95..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/__methods__/get_deploy_dialog.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Description: Dynamically choose dialog based on Category:environment chosen in pre-dialog
-#
-
-# Set to true to dynamically choose dialog name based on environment tag
-run_env_dialog = false
-
-if run_env_dialog
-  # Get incoming environment tags from pre-dialog
-  dialog_input_vm_tags = $evm.root['dialog_input_vm_tags']
-
-  # Use a regular expression to grab the environment from the incoming tag category
-  # I.e. environment/dev for Category:environment Tag:dev
-  regex = /(.*)(\/)(\w*)/i
-
-  # If the regular express matches dynamically choose the next dialog
-  if regex =~ dialog_input_vm_tags
-    cat = Regexp.last_match[1]
-    tag = Regexp.last_match[3]
-    $evm.log("info", "Category: <#{cat}> Tag: <#{tag}>")
-    dialog_name = 'miq_provision_dialogs-deploy-#{tag}'
-  end
-  ## Set dialog name in the root object to be picked up by dialogs
-  $evm.root['dialog_name'] = dialog_name
-  $evm.log("info", "Launching <#{dialog_name}>")
-
-end
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/__methods__/get_deploy_dialog.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/__methods__/get_deploy_dialog.yaml
deleted file mode 100644
index 89f349893..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/__methods__/get_deploy_dialog.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: method
-version: 1.0
-object:
-  attributes:
-    name: get_deploy_dialog
-    display_name: 
-    description: 
-    scope: instance
-    language: ruby
-    location: inline
-  inputs: []
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/_missing.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/_missing.yaml
deleted file mode 100644
index 99e72be80..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/_missing.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: ".missing"
-    inherits: 
-    description: 
-  fields: []
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/evmgroup-super_administrator.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/evmgroup-super_administrator.yaml
deleted file mode 100644
index b101d7775..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/Profile.class/evmgroup-super_administrator.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: EvmGroup-super_administrator
-    inherits: 
-    description: 
-  fields: []
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/__methods__/update_provision_status.rb b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/__methods__/update_provision_status.rb
deleted file mode 100644
index 8ee77279c..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/__methods__/update_provision_status.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Description: This method updates the host provisioning status
-# Required inputs: status
-#
-
-prov   = $evm.root['miq_host_provision']
-status = $evm.inputs['status']
-
-unless prov
-  $evm.log(:error, "miq_host_provision object not provided")
-  exit(MIQ_STOP)
-end
-
-# Update Status for on_entry,on_exit
-if $evm.root['ae_result'] == 'ok' || $evm.root['ae_result'] == 'error'
-  prov.message = status
-end
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/__methods__/update_provision_status.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/__methods__/update_provision_status.yaml
deleted file mode 100644
index 21bbd1e81..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/__methods__/update_provision_status.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-object_type: method
-version: 1.0
-object:
-  attributes:
-    name: update_provision_status
-    display_name: 
-    description: 
-    scope: instance
-    language: ruby
-    location: inline
-  inputs:
-  - field:
-      aetype: 
-      name: status
-      display_name: 
-      datatype: string
-      priority: 1
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/host_pxe_install.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/host_pxe_install.yaml
deleted file mode 100644
index 081de8725..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/HostProvision.class/host_pxe_install.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: host_pxe_install
-    inherits: 
-    description: 
-  fields: []
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__class__.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__class__.yaml
deleted file mode 100644
index 5a5e6606b..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__class__.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-object_type: class
-version: 1.0
-object:
-  attributes:
-    description: 
-    display_name: 
-    name: Methods
-    type: 
-    inherits: 
-    visibility: 
-    owner: 
-  schema:
-  - field:
-      aetype: method
-      name: execute
-      display_name: 
-      datatype: string
-      priority: 1
-      owner: 
-      default_value: 
-      substitute: true
-      message: create
-      visibility: 
-      collect: 
-      scope: 
-      description: 
-      condition: 
-      on_entry: 
-      on_exit: 
-      on_error: 
-      max_retries: 
-      max_time: 
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/check_provisioned.rb b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/check_provisioned.rb
deleted file mode 100644
index 6f546baca..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/check_provisioned.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Description: This method checks to see if the vm has been provisioned
-#
-
-# Get provision object
-prov = $evm.root['miq_provision'] || $evm.root['miq_host_provision']
-
-# Get current provisioning status
-result = prov.statemachine_task_status
-
-$evm.log('info', "ProvisionCheck returned <#{result}>")
-
-case result
-when 'error'
-  $evm.root['ae_result'] = 'error'
-  reason = prov.message
-  reason = reason[7..-1] if reason[0..6] == 'Error: '
-  $evm.root['ae_reason'] = reason
-when 'retry'
-  $evm.root['ae_result']         = 'retry'
-  $evm.root['ae_retry_interval'] = '1.minute'
-when 'ok'
-  # Bump State
-  $evm.root['ae_result'] = 'ok'
-end
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/check_provisioned.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/check_provisioned.yaml
deleted file mode 100644
index 6899b2442..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/check_provisioned.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: method
-version: 1.0
-object:
-  attributes:
-    name: check_provisioned
-    display_name: 
-    description: 
-    scope: instance
-    language: ruby
-    location: inline
-  inputs: []
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/customizerequest.rb b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/customizerequest.rb
deleted file mode 100644
index a86467e4e..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/customizerequest.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Description: This method is used a placeholder to Customize the provisioning request
-#
-
-prov = $evm.root['miq_host_provision']
-$evm.log("info", "Inspecting the provisioning object: <#{prov.inspect}>")
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/customizerequest.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/customizerequest.yaml
deleted file mode 100644
index e18ad4d02..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/customizerequest.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: method
-version: 1.0
-object:
-  attributes:
-    name: CustomizeRequest
-    display_name: 
-    description: 
-    scope: instance
-    language: ruby
-    location: inline
-  inputs: []
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/postprovision_host.rb b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/postprovision_host.rb
deleted file mode 100644
index 6596c2762..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/postprovision_host.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Description: This method is used to perform post provisioning tasks
-#
-
-prov = $evm.root['miq_host_provision']
-
-ks_cfg = prov.get_option_last(:customization_template_id)
-
-# ESX Processing only
-if ks_cfg.include?('ESXi')
-  # Enabling VMOTION traffic on vm Kernel
-  prov.host.enable_vmotion
-  $evm.log("info", "Host: <#{prov.host.name}> Enabling VMOTION on vm Kernel")
-
-  # Exit Maintenance Mode
-  prov.host.exit_maintenance_mode
-  $evm.log("info", "Host: <#{prov.host.name}> Exiting maintenance-mode")
-end
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/postprovision_host.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/postprovision_host.yaml
deleted file mode 100644
index 8c1671af8..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/postprovision_host.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: method
-version: 1.0
-object:
-  attributes:
-    name: PostProvision_Host
-    display_name: 
-    description: 
-    scope: instance
-    language: ruby
-    location: inline
-  inputs: []
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/preprovision_host.rb b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/preprovision_host.rb
deleted file mode 100644
index af6af2e74..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/preprovision_host.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Description: This method is used as a placeholder to Customize the provisioning request
-#
-
-# prov   = $evm.root['miq_host_provision']
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/preprovision_host.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/preprovision_host.yaml
deleted file mode 100644
index 6a6787763..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/preprovision_host.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: method
-version: 1.0
-object:
-  attributes:
-    name: PreProvision_Host
-    display_name: 
-    description: 
-    scope: instance
-    language: ruby
-    location: inline
-  inputs: []
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/provision.rb b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/provision.rb
deleted file mode 100644
index 2ca6f022e..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/provision.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Description: This method launches the host provisioning job
-#
-
-$evm.root["miq_host_provision"].execute
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/provision.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/provision.yaml
deleted file mode 100644
index f7bf6a587..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/__methods__/provision.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: method
-version: 1.0
-object:
-  attributes:
-    name: Provision
-    display_name: 
-    description: 
-    scope: instance
-    language: ruby
-    location: inline
-  inputs: []
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/checkprovisioned.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/checkprovisioned.yaml
deleted file mode 100644
index e496755df..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/checkprovisioned.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: CheckProvisioned
-    inherits: 
-    description: 
-  fields:
-  - execute:
-      value: check_provisioned
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/customizerequest.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/customizerequest.yaml
deleted file mode 100644
index 4141b7d0a..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/customizerequest.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: CustomizeRequest
-    inherits: 
-    description: 
-  fields:
-  - execute:
-      value: CustomizeRequest
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/postprovision_host.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/postprovision_host.yaml
deleted file mode 100644
index 910d7fb4d..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/postprovision_host.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: PostProvision_Host
-    inherits: 
-    description: 
-  fields:
-  - execute:
-      value: PostProvision_Host
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/preprovision_host.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/preprovision_host.yaml
deleted file mode 100644
index eff531208..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/preprovision_host.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: PreProvision_Host
-    inherits: 
-    description: 
-  fields:
-  - execute:
-      value: PreProvision_Host
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/provision.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/provision.yaml
deleted file mode 100644
index b5a8ebba6..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/Methods.class/provision.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: Provision
-    inherits: 
-    description: 
-  fields:
-  - execute:
-      value: Provision
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/__namespace__.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/__namespace__.yaml
deleted file mode 100644
index 5ce1866e7..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/StateMachines/__namespace__.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-object_type: namespace
-version: 1.0
-object:
-  attributes:
-    name: StateMachines
-    description: 
-    display_name: 
-    priority: 
-    enabled: 
diff --git a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/__namespace__.yaml b/content/automate/ManageIQ/Infrastructure/Host/Provisioning/__namespace__.yaml
deleted file mode 100644
index fd48944e7..000000000
--- a/content/automate/ManageIQ/Infrastructure/Host/Provisioning/__namespace__.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-object_type: namespace
-version: 1.0
-object:
-  attributes:
-    name: Provisioning
-    description: 
-    display_name: 
-    priority: 
-    enabled: 
diff --git a/content/automate/ManageIQ/System/CommonMethods/StateMachineMethods.class/host_provision_finished.yaml b/content/automate/ManageIQ/System/CommonMethods/StateMachineMethods.class/host_provision_finished.yaml
deleted file mode 100644
index d911658b4..000000000
--- a/content/automate/ManageIQ/System/CommonMethods/StateMachineMethods.class/host_provision_finished.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: host_provision_finished
-    inherits: 
-    description: 
-  fields:
-  - execute:
-      value: task_finished(object => 'miq_host_provision', message => 'Host Provisioned
-        Successfully' )
diff --git a/content/automate/ManageIQ/System/Policy.class/__methods__/miqhostprovision_auto_approve.rb b/content/automate/ManageIQ/System/Policy.class/__methods__/miqhostprovision_auto_approve.rb
deleted file mode 100644
index a92918d90..000000000
--- a/content/automate/ManageIQ/System/Policy.class/__methods__/miqhostprovision_auto_approve.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Description: This method auto-approves the host provisioning request
-#
-$evm.log("info", "AUTO-APPROVING")
-$evm.root["miq_request"].approve("admin", "Auto-Approved")
diff --git a/content/automate/ManageIQ/System/Policy.class/__methods__/miqhostprovision_auto_approve.yaml b/content/automate/ManageIQ/System/Policy.class/__methods__/miqhostprovision_auto_approve.yaml
deleted file mode 100644
index f10c160e1..000000000
--- a/content/automate/ManageIQ/System/Policy.class/__methods__/miqhostprovision_auto_approve.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: method
-version: 1.0
-object:
-  attributes:
-    name: MiqHostProvision_Auto_Approve
-    display_name: 
-    description: 
-    scope: instance
-    language: ruby
-    location: inline
-  inputs: []
diff --git a/content/automate/ManageIQ/System/Policy.class/miqhostprovisionrequest_created.yaml b/content/automate/ManageIQ/System/Policy.class/miqhostprovisionrequest_created.yaml
deleted file mode 100644
index d739562a3..000000000
--- a/content/automate/ManageIQ/System/Policy.class/miqhostprovisionrequest_created.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: MiqHostProvisionRequest_created
-    inherits: 
-    description: 
-  fields:
-  - meth5:
-      value: MiqHostProvision_Auto_Approve
diff --git a/content/automate/ManageIQ/System/Policy.class/miqhostprovisionrequest_starting.yaml b/content/automate/ManageIQ/System/Policy.class/miqhostprovisionrequest_starting.yaml
deleted file mode 100644
index 08c42c68d..000000000
--- a/content/automate/ManageIQ/System/Policy.class/miqhostprovisionrequest_starting.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: MiqHostProvisionRequest_starting
-    inherits: 
-    description: 
-  fields: []
diff --git a/content/automate/ManageIQ/System/Policy.class/miqhostprovisionrequest_updated.yaml b/content/automate/ManageIQ/System/Policy.class/miqhostprovisionrequest_updated.yaml
deleted file mode 100644
index f2b7c9498..000000000
--- a/content/automate/ManageIQ/System/Policy.class/miqhostprovisionrequest_updated.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: MiqHostProvisionRequest_updated
-    inherits: 
-    description: 
-  fields: []
diff --git a/content/automate/ManageIQ/System/Request.class/ui_host_provision_info.yaml b/content/automate/ManageIQ/System/Request.class/ui_host_provision_info.yaml
deleted file mode 100644
index aa9fee0a1..000000000
--- a/content/automate/ManageIQ/System/Request.class/ui_host_provision_info.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-object_type: instance
-version: 1.0
-object:
-  attributes:
-    display_name: 
-    name: UI_Host_Provision_Info
-    inherits: 
-    description: 
-  fields:
-  - rel5:
-      value: "/Infrastructure/Host/Provisioning/Profile/${/#user.normalized_ldap_group}#${process#message}"
diff --git a/spec/automation/unit/builtin_method_validation/parse_automation_request_spec.rb b/spec/automation/unit/builtin_method_validation/parse_automation_request_spec.rb
index 1697dc4b8..7cb47027a 100644
--- a/spec/automation/unit/builtin_method_validation/parse_automation_request_spec.rb
+++ b/spec/automation/unit/builtin_method_validation/parse_automation_request_spec.rb
@@ -26,14 +26,6 @@
       "target_instance"  => "Migrate")
   end
 
-  it "for host_provision request" do
-    ws = MiqAeEngine.instantiate("#{inst}?request=host_provision", user)
-    expect(ws.root.attributes).to include(
-      "target_component" => "Host",
-      "target_class"     => "Lifecycle",
-      "target_instance"  => "Provisioning")
-  end
-
   it "for configured_system_provision request" do
     ws = MiqAeEngine.instantiate("#{inst}?request=configured_system_provision", user)
     expect(ws.root.attributes).to include(
diff --git a/spec/automation/unit/builtin_method_validation/parse_provider_category_spec.rb b/spec/automation/unit/builtin_method_validation/parse_provider_category_spec.rb
index 73a273e87..d4f3e1235 100644
--- a/spec/automation/unit/builtin_method_validation/parse_provider_category_spec.rb
+++ b/spec/automation/unit/builtin_method_validation/parse_provider_category_spec.rb
@@ -94,12 +94,6 @@ def prepend_namespace(ws)
       expect(ws.root["ae_provider_category"]).to eq("infrastructure")
       expect(prepend_namespace(ws)).to eq("vmware")
     end
-
-    it "for vm_host_provision" do
-      ws = MiqAeEngine.instantiate("#{inst}?MiqRequestTask::miq_host_provision=#{miq_host_provision.id}", user)
-      expect(ws.root["ae_provider_category"]).to eq("infrastructure")
-      expect(prepend_namespace(ws)).to eq("vmware")
-    end
   end
 
   context "#parse_provider_category for platform_category" do