diff --git a/alembic/env.pyc b/alembic/env.pyc
deleted file mode 100644
index 5068e06..0000000
Binary files a/alembic/env.pyc and /dev/null differ
diff --git a/puppet/mercy/manifests/#init.pp# b/puppet/mercy/manifests/#init.pp#
deleted file mode 100644
index 28a67ba..0000000
--- a/puppet/mercy/manifests/#init.pp#
+++ /dev/null
@@ -1,31 +0,0 @@
-class mercy(
-  $environment,
-  $version,
-  $ensure,
-  $rabbitmq_uri,
-  $process_user    => 'mercy',
-  $process_group   => 'mercy',
-  $process_threads => 5,
-  $servername      => $::fqdn,
-  $rabbitmq_user   => 'mercy',
-  $rabbitmq_pw     => 'mercy',
-  $rabbitmq_vhost  => 'mercy',
-  $vhost_dir       => '/etc/apache/httpd/conf.d',
-  $apache_service  => 'httpd',
-  $port            => 443,
-  $postgres_uri    => 'localhost',
-  $postgres_user   => 'mercy',
-  $postgres_pw     => 'mercy',
-  $postgres_db     => 'mercy')
-{
-  if ! defined(User[$process_user]) {
-    user { $process_user:
-      ensure => 'present'
-    }
-  }
-  if ! defined(Group[$process_group]) {
-    user { $process_group:
-      ensure => 'present'
-    }
-  }
-}
diff --git a/puppet/mercy/manifests/params.pp b/puppet/mercy/manifests/params.pp
deleted file mode 100644
index 03c6d0e..0000000
--- a/puppet/mercy/manifests/params.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class mercy::params
-{
-
-}
diff --git a/puppet/mercy/manifests/params.pp~ b/puppet/mercy/manifests/params.pp~
deleted file mode 100644
index 3f9e754..0000000
--- a/puppet/mercy/manifests/params.pp~
+++ /dev/null
@@ -1,23 +0,0 @@
-class mercy::params ( $environment,
-                      $version,
-                      $ensure,
-                      $rabbitmq_uri,
-                      # ---- Everything below is optional
-                      $process_user    => 'mercy',
-                      $process_group   => 'mercy',
-                      $process_threads => 5,
-                      $servername      => $::fqdn,
-                      $rabbitmq_user   => 'mercy',
-                      $rabbitmq_pw     => 'mercy',
-                      $rabbitmq_vhost  => 'mercy',
-                      $vhost_dir       => '/etc/apache/httpd/conf.d',
-                      $apache_service  => 'httpd',
-                      $port            => 443,
-                      $postgres_uri    => 'localhost',
-                      $postgres_user   => 'mercy',
-                      $postgres_pw     => 'mercy',
-                      $postgres_db     => 'mercy'
-                      )
-{
-
-}
diff --git a/puppet/mercy/templates/apache/vhost.erb~ b/puppet/mercy/templates/apache/vhost.erb~
deleted file mode 100644
index ad3bc5f..0000000
--- a/puppet/mercy/templates/apache/vhost.erb~
+++ /dev/null
@@ -1,12 +0,0 @@
-<VirtualHost *:<%= scope.lookupvar('::mercy::params::port') %>>
-    ServerName <%= scope.lookupvar('::fqdn') %>
-    WSGIDaemonProcess mercy user=<%= scope.lookupvar('::mercy::params::process_user') %> group=<%= scope.lookupvar('::mercy::params::process_group') %> threads=<%= scope.lookupvar('::mercy::params::process_threads') %>
-    WSGIScriptAlias / /opt/mercy/scripts/mercy.wsgi
-
-    <Directory /opt/mercy>
-	WSGIProcessGroup mercy
-	WSGIApplicationGroup %{GLOBAL}
-	Order deny, allow
-	Allow from all
-    </Directory>
-</VirtualHost>
\ No newline at end of file
diff --git a/puppet/mercy/templates/python/alembic.ini.erb~ b/puppet/mercy/templates/python/alembic.ini.erb~
deleted file mode 100644
index 88a9e8a..0000000
--- a/puppet/mercy/templates/python/alembic.ini.erb~
+++ /dev/null
@@ -1,49 +0,0 @@
-# A generic, single database configuration.
-
-[alembic]
-# path to migration scripts
-script_location = alembic
-
-# template used to generate migration files
-# file_template = %%(rev)s_%%(slug)s
-
-# set to 'true' to run the environment during
-# the 'revision' command, regardless of autogenerate
-# revision_environment = false
-
-sqlalchemy.url = driver://mercy:mercy@postgresql.aklabs.net/mercy
-
-# Logging configuration
-[loggers]
-keys = root,sqlalchemy,alembic
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = WARN
-handlers = console
-qualname =
-
-[logger_sqlalchemy]
-level = WARN
-handlers =
-qualname = sqlalchemy.engine
-
-[logger_alembic]
-level = INFO
-handlers =
-qualname = alembic
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %H:%M:%S