diff --git a/PKGBUILD b/PKGBUILD
index f4a3c92..16e695d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-#Maintainer: Iwan Timmer <irtimmer@gmail.com>
+# Maintainer: Iwan Timmer <irtimmer@gmail.com>

 pkgname=kubernetes
 pkgver=1.7.4
@@ -10,16 +10,16 @@ makedepends=('go' 'rsync' 'go-bindata')
 optdepends=('etcd: etcd cluster required to run Kubernetes')
 arch=('x86_64' 'i686')
 source=("https://github.com/kubernetes/kubernetes/archive/v$pkgver.tar.gz"
-   "https://github.com/kubernetes/contrib/archive/$_contribver.tar.gz"
+       "https://github.com/kubernetes/contrib/archive/$_contribver.tar.gz"
         "kubernetes.install")
 url="http://kubernetes.io/"
 license=("APACHE")
 backup=('etc/kubernetes/apiserver'
-   'etc/kubernetes/config'
-   'etc/kubernetes/controller-manager'
-   'etc/kubernetes/kubelet'
-   'etc/kubernetes/proxy'
-   'etc/kubernetes/scheduler')
+       'etc/kubernetes/config'
+       'etc/kubernetes/controller-manager'
+       'etc/kubernetes/kubelet'
+       'etc/kubernetes/proxy'
+       'etc/kubernetes/scheduler')
 install=kubernetes.install
 sha256sums=('a480c54f3108f9a7ff118d90a0a16be52ecd34dcdb786f6c5d287d5298da64f0'
             'ab36d4243baf8cd47aba94f22f4c41a2980cf2ffca51ccda28b1e7685f500282'
@@ -27,8 +27,8 @@ sha256sums=('a480c54f3108f9a7ff118d90a0a16be52ecd34dcdb786f6c5d287d5298da64f0'

 build() {
     cd $srcdir/kubernetes-$pkgver
-
-    make
+
+    make -j1
     hack/generate-docs.sh
 }

@@ -42,7 +42,7 @@ package() {
     for bin in "${binaries[@]}"; do
         install -Dm755 _output/local/bin/linux/$_kubearch/$bin $pkgdir/usr/bin/$bin
     done
-
+
     # install manpages
     install -d $pkgdir/usr/share/man/man1/
     install -pm 644 docs/man/man1/* $pkgdir/usr/share/man/man1
@@ -55,7 +55,7 @@ package() {
     # install config files
     install -dm 755 $pkgdir/etc/kubernetes/
     install -m 644 -t $pkgdir/etc/kubernetes/ init/systemd/environ/*
-
+
     # install service files
     install -dm 755 $pkgdir/usr/lib/systemd/system
     install -m 644 -t $pkgdir/usr/lib/systemd/system init/systemd/*.service
diff --git a/kubernetes.install b/kubernetes.install
index 01cb2b5..5b55e3d 100644
--- a/kubernetes.install
+++ b/kubernetes.install
@@ -7,8 +7,3 @@ post_install() {
 post_upgrade() {
     post_install
 }
-
-post_remove() {
-    getent passwd kube >/dev/null && userdel kube
-    getent group kube >/dev/null && groupdel kube
-}