diff --git a/kalibro-configurations/kalibro-configurations.spec b/kalibro-configurations/kalibro-configurations.spec
index 1afc069..07d58d4 100644
--- a/kalibro-configurations/kalibro-configurations.spec
+++ b/kalibro-configurations/kalibro-configurations.spec
@@ -23,6 +23,7 @@ ln -sf /usr/lib/kalibro_configurations/.bundle .
 ln -sfT /usr/lib/kalibro_configurations/vendor/bundle vendor/bundle
 rm -f Gemfile Gemfile.lock .bundle vendor/bundle 
 rm -rf tmp log
+
 %install
 mkdir -p %{buildroot}/usr/lib/kalibro-configurations
 cp -r * %{buildroot}/usr/lib/kalibro-configurations
@@ -30,6 +31,7 @@ rm -rf %{buildroot}/usr/lib/kalibro-configurations/log
 ln -sfT /var/log/kalibro-configurations %{buildroot}/usr/lib/kalibro-configurations/log
 ln -sfT /etc/kalibro-configurations/database.yml %{buildroot}/usr/lib/kalibro-configurations/config/database.yml
 ln -sfT /etc/kalibro-configurations/secrets.yml %{buildroot}/usr/lib/kalibro-configurations/config/secrets.yml
+
 mkdir -p %{buildroot}/lib/systemd/system
 cat > %{buildroot}/lib/systemd/system/kalibro_configurations.service <<EOF
 [Unit]
@@ -42,11 +44,13 @@ EnvironmentFile=-/etc/sysconfig/kalibro_configurations
 User=kalibro_configurations
 WorkingDirectory=/usr/lib/kalibro-configurations
 ExecStart=/usr/bin/env bundle exec rails s -p 8083 -e production
+
 [Install]
 WantedBy=multi-user.target
 EOF
+
 mkdir -p %{buildroot}/etc/kalibro-configurations
-cat > %{buildroot}/etc/kalibro-configurations/database.yml << EOF
+cat > %{buildroot}/etc/kalibro-configurations/database.yml <<EOF
 production:
   adapter: postgresql
   encoding: unicode
@@ -56,12 +60,11 @@ production:
   password:
 EOF
 
-cat > %{buildroot}/etc/kalibro-configurations/secrets.yml << EOF
-# Do not keep production secrets in the repository,
-# instead read values from the environment.
+cat > %{buildroot}/etc/kalibro-configurations/secrets.yml <<EOF
 production:
   secret_key_base: $(bundle exec rake secret)
 EOF
+
 #FIXME HACK, REMOVE LATER
 sed -i -e "s/require.*database_cleaner/# &/" %{buildroot}/usr/lib/kalibro-configurations/app/controllers/tests_controller.rb
 
@@ -73,27 +76,6 @@ fi
 mkdir -p /var/log/kalibro-configurations 
 chown -R kalibro_configurations:kalibro_configurations /var/log/kalibro-configurations
 chown -R kalibro_configurations:kalibro_configurations /usr/lib/kalibro-configurations
-if [ -x /usr/bin/psql ]; then
-  if [ `systemctl is-active postgresql`!="active" ]; then
-    postgresql-setup initdb || true
-    systemctl start postgresql
-  fi
-  if [ "$(sudo -u postgres -i psql --quiet --tuples-only -c "select count(*) from pg_user where usename = 'kalibro_configurations';")" -eq 0 ]; then
-    # create user
-    sudo -u postgres -i createuser kalibro_configurations
-  fi
-
-  if [ "$(sudo -u postgres -i psql --quiet --tuples-only -c "select count(1) from pg_database where datname = 'kalibro_configurations_production';")" -eq 0 ]; then
-    # create database
-    sudo -u postgres -i createdb --owner=kalibro_configurations kalibro_configurations_production
-  fi
-
-  cd /usr/lib/kalibro-configurations/
-  su kalibro_configurations -c "RAILS_ENV=production bundle exec rake db:migrate"
-  if [ $1 -eq 1 ]; then
-    su kalibro_configurations -c "RAILS_ENV=production bundle exec rake db:seed"
-  fi
-fi
 
 if [ $1 -gt 1 ]; then
   echo 'Restarting kalibro_configurations'
diff --git a/remove_package.sh b/remove_package.sh
index 1b57587..05d1cd9 100755
--- a/remove_package.sh
+++ b/remove_package.sh
@@ -3,6 +3,3 @@
 sudo yum remove kalibro-configurations
 sudo rm -rf /etc/kalibro-configurations
 sudo rm -rf /var/log/kalibro-configurations
-
-sudo -u postgres -i dropdb kalibro_configurations_production
-sudo -u postgres -i dropuser kalibro_configurations_production
--
libgit2 0.21.2