diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index d6fbe9b..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,9 +0,0 @@
-[submodule "modules/vcsrepo"]
-	path = modules/vcsrepo
-	url = https://github.com/puppetlabs/puppetlabs-vcsrepo
-[submodule "modules/concat"]
-	path = modules/concat
-	url = https://github.com/puppetlabs/puppetlabs-concat
-[submodule "modules/stdlib"]
-	path = modules/stdlib
-	url = https://github.com/puppetlabs/puppetlabs-stdlib
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
deleted file mode 100644
index 1de88dc..0000000
--- a/.puppet-lint.rc
+++ /dev/null
@@ -1,4 +0,0 @@
---fail-on-warnings
---no-arrow-alignment-check
---no-documentation-check
---no-variables_not_enclosed-check
diff --git a/README.md b/README.md
index 67c0c73..d42acd9 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
-# dotfiles
+# Dotfiles
 
 [![CircleCI](https://circleci.com/gh/RealOrangeOne/dotfiles.svg?style=svg)](https://circleci.com/gh/RealOrangeOne/dotfiles)
 
 Settings and Preferences for transfer between machines
 
 ## Requirements
-- `puppet`
-- `~/.dotfiles` repo from private
+- `pipenv`
+- Correctly setup `~/.dotfiles` directory
 
 ## Usage
-1. run `deploy.sh` as root
+1. Run `pipenv run deploy`
 2. ???
 3. Profit!
diff --git a/makepkg.patch b/makepkg.patch
deleted file mode 100644
index 5663f31..0000000
--- a/makepkg.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** /usr/bin/makepkg	2018-05-29 09:10:22.097063834 +0100
---- /usr/bin/makepkg.orig	2018-05-29 09:08:25.916705962 +0100
-***************
-*** 1403,1409 ****
-  	if (( EUID == 0 )); then
-  		error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\
-  catastrophic damage to your system.")" "makepkg"
-! 		# exit $E_ROOT
-  	fi
-  else
-  	if [[ -z $FAKEROOTKEY ]]; then
---- 1403,1409 ----
-  	if (( EUID == 0 )); then
-  		error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\
-  catastrophic damage to your system.")" "makepkg"
-! 		exit $E_ROOT
-  	fi
-  else
-  	if [[ -z $FAKEROOTKEY ]]; then