diff --git a/custom/lib/facter/dnsaliases.rb b/custom/lib/facter/dnsaliases.rb
deleted file mode 100644
index 55cf53c..0000000
--- a/custom/lib/facter/dnsaliases.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-
-if File.exists?("/etc/dnsaliases")
-  Facter.add("dnsaliases") do
-    setcode do
-      Facter::Util::Resolution.exec('cat /etc/dnsaliases').chomp
-    end
-  end
-end
diff --git a/dns/files/create_dynamic_records.sh b/dns/files/create_dynamic_records.sh
deleted file mode 100755
index 8e253e8..0000000
--- a/dns/files/create_dynamic_records.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-if [ $# != 2 ]; then 
- echo "ERR: Must have two arguments: DNS server name and zone/environment" 1>&2
- return 2 
-fi
-
-ZONE=$2
-SERVER=$1
-FACTS_DIR="/var/lib/puppet/yaml/facts"
-ZONE_FILE="/srv/puppet/files/common/dns/db.$ZONE-dynamic.$SERVER"
-
-if [ ! -d "${FACTS_DIR}" ]; then
-    echo "ERR: Cannot find Facter facts directory ${FACTS_DIR}" 1>&2
-    exit 3
-fi
-
-if [ -f "${ZONE_FILE}" ]; then 
-  rm $ZONE_FILE
-fi 
-cd $FACTS_DIR
-for i in `grep -l "environment: $ZONE" *`; 
-do
-  echo $i 
-  hn=`grep hostname $i | cut -f 2 -d ':' | tr -d ' '`
-  ip=`grep "ipaddress:" $i | cut -f 2 -d ':'`
-  a=`grep "aliases:" $i | cut -f 2 -d ':' | tr -d '"' | tr -d ' '| tr ',' "\n"`; 
-  echo "$hn IN A $ip" >> $ZONE_FILE
-  if [ "$a" != "" ]; then
-    for j in $a; 
-     do 
-       echo "$j CNAME $hn" >> $ZONE_FILE
-     done 
-  fi
-done
diff --git a/dns/manifests/init.pp b/dns/manifests/init.pp
index 2f09728..e6cba45 100644
--- a/dns/manifests/init.pp
+++ b/dns/manifests/init.pp
@@ -236,12 +236,9 @@ define dns::zone($role = "master", $master = [], $slaves = [], $source = "AUTO")
             }
             file { "${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic":
                 ensure  => present,
-                content => generate(
-                          "/bin/sh",
-                          "/etc/puppet/modules/dns/files/create_dynamic_records.sh",
-                          $homename,
-                          $zone),
-		mode    => 0640,
+                source  => [ "puppet:///files/dns/db.${zonefile}-dynamic.${homename}",
+                             "puppet:///modules/dns/empty", ],
+                mode    => 0640,
                 owner   => "root",
                 group   => $dns::server::group,
                 require => $operatingsystem ? {
diff --git a/dnsaliases/manifests/init.pp b/dnsaliases/manifests/init.pp
deleted file mode 100644
index ddf107a..0000000
--- a/dnsaliases/manifests/init.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# .
-#
-# === Global variables
-#
-#   $aliases:
-#       Comma-separated list of aliases for this host.
-#
-
-class dnsaliases( $aliases ) {
-
-  $content = "$aliases\n"
-
-    file { "/etc/dnsaliases":
-        ensure  => present,
-        mode    => 0644,
-        owner   => root,
-        group   => root,
-        content => $content,       
-    }
-
-}
diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index a436753..00c775e 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -1,7 +1,7 @@
 
 # Install and configure Puppet client.
 #
-class puppet::client ($environment='') {
+class puppet::client {
 
     tag("bootstrap")
     
diff --git a/puppet/templates/puppet.conf.erb b/puppet/templates/puppet.conf.erb
index bd6f2e6..d214146 100644
--- a/puppet/templates/puppet.conf.erb
+++ b/puppet/templates/puppet.conf.erb
@@ -39,10 +39,6 @@
     # The bit length of keys.
     keylength = <%= puppet_keylength %>
 
-<% if !(environment == '') %>
-    # Environment this entity is in.
-    environment = <%= environment %>
-<% end -%>
 <% if puppetversion[/\d+/].to_i >= 2 -%>
 [agent]
     # Ignore site manifest when run as agent. Fixes warnings about