diff --git a/clarified/manifests/init.pp b/clarified/manifests/init.pp
index 2ed5895..f8136c0 100644
--- a/clarified/manifests/init.pp
+++ b/clarified/manifests/init.pp
@@ -38,8 +38,6 @@ class clarified::analyzer {
 #
 class clarified::recorder {
 
-    include ia32libs
-
     if !$clarified_recorder_package {
         if $clarified_recorder_package_latest {
             $clarified_recorder_package = $clarified_recorder_package_latest
@@ -77,7 +75,7 @@ class clarified::recorder {
         mode   => "0644",
         owner  => root,
         group  => root,
-        before => Exec["/usr/local/src/clarified-recorder-linux-i686.sh"],
+        before => Exec["/usr/local/src/clarified-recorder-linux.sh"],
     }
 
     File["/etc/clarified/probe.d", "/etc/clarified/remote.d"] {
@@ -87,22 +85,22 @@ class clarified::recorder {
         source  => "puppet:///modules/custom/empty",
     }
 
-    file { "/usr/local/src/clarified-recorder-linux-i686.sh":
+    file { "/usr/local/src/clarified-recorder-linux.sh":
         ensure => present,
         mode   => "0755",
         owner  => root,
         group  => root,
         source => "puppet:///files/packages/${clarified_recorder_package}",
-        before => Exec["/usr/local/src/clarified-recorder-linux-i686.sh"],
+        before => Exec["/usr/local/src/clarified-recorder-linux.sh"],
     }
     exec { "rm -f /usr/local/probe":
         path        => "/bin:/usr/bin:/sbin:/usr/sbin",
         onlyif      => "test -h /usr/local/probe",
-        subscribe   => File["/usr/local/src/clarified-recorder-linux-i686.sh"],
-        before      => Exec["/usr/local/src/clarified-recorder-linux-i686.sh"],
+        subscribe   => File["/usr/local/src/clarified-recorder-linux.sh"],
+        before      => Exec["/usr/local/src/clarified-recorder-linux.sh"],
         refreshonly => true,
     }
-    exec { "/usr/local/src/clarified-recorder-linux-i686.sh":
+    exec { "/usr/local/src/clarified-recorder-linux.sh":
         creates => "/usr/local/probe",
         notify  => Service["clarified-probe"],
     }
@@ -111,7 +109,7 @@ class clarified::recorder {
         path        => "/bin:/usr/bin:/sbin:/usr/sbin",
         cwd         => "/usr/local/probe",
         command     => "sed s:@PREFIX@:/usr/local/probe: clarified-functions.in > /etc/clarified/clarified-functions",
-        subscribe   => Exec["/usr/local/src/clarified-recorder-linux-i686.sh"],
+        subscribe   => Exec["/usr/local/src/clarified-recorder-linux.sh"],
         before      => Service["clarified-probe"],
         refreshonly => true,
     }
@@ -122,7 +120,7 @@ class clarified::recorder {
         owner   => root,
         group   => root,
         source  => "/usr/local/probe/probe-init.sh",
-        require => Exec["/usr/local/src/clarified-recorder-linux-i686.sh"],
+        require => Exec["/usr/local/src/clarified-recorder-linux.sh"],
         before  => Service["clarified-probe"],
     }