diff --git a/Makefile b/Makefile
index fecaa7d6364dc0fc05f4beee9b01e105582191d3..494ba36d46c87ef8c672fcadb0f677ec8d18a21b 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ build_win:
 
 
 clean:
-	@rm -f build/${PROVIDER}/bin/bitmask-*
+	@rm -rf build/
 	@unlink branding/assets/default
 
 #########################################################################
@@ -99,7 +99,7 @@ tgz:
 	@chmod +x $(TGZ_PATH)/helpers/bitmask-root
 	@wget -O $(TGZ_PATH)/helpers/se.leap.bitmask.policy https://0xacab.org/leap/bitmask-dev/raw/master/src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy
 	@cd build/ && tar cvzf bitmask-vpn_$(VERSION).tgz ${TGZ_NAME}
-	@rm -f $(TGZ_PATH)
+	@rm -rf $(TGZ_PATH)
 
 gen_pkg_win:
 	@mkdir -p build/${PROVIDER}/windows/
@@ -142,7 +142,8 @@ gen_pkg_deb:
 # packaging action
 #########################################################################
 
-packages: pkg_snap pkg_deb pkg_osx pkg_win
+packages: package_deb package_osx package_win
+# package_snap
 
 package_snap:
 	@make -C build/${PROVIDER} pkg_snap
diff --git a/branding/templates/osx/generate.py b/branding/templates/osx/generate.py
index 440ee34b2f74e5d400ee37199a9f29ad1cd5c3f9..6ea15bdb815ad9df39a0e4a3f67d21c46381134c 100644
--- a/branding/templates/osx/generate.py
+++ b/branding/templates/osx/generate.py
@@ -98,9 +98,10 @@ with open(APP_PATH + "/Contents/PkgInfo", "w") as f:
 # 3. Copy the binary payloads
 # --------------------------------------------
 
-copy_payload(ENTRYPOINT)
-copy_payload(HELPER)
-copy_payload(OPENVPN, destfile='/Contents/Resources/openvpn.leap')
+# TODO ------------------------ move this to makefile
+# copy_payload(ENTRYPOINT)
+# copy_payload(HELPER)
+# copy_payload(OPENVPN, destfile='/Contents/Resources/openvpn.leap')
 
 # 4. Copy the app icon from the assets folder
 # -----------------------------------------------
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 70da70cbff395d34cb55039ab41f848d1fb9eb03..9af54a94222e22071e2211f6bc0b8c09c7eb7bc1 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -1,6 +1,6 @@
 // Code generated by go generate; DO NOT EDIT.
 // This file was generated by vendorize.py
-// At 2019-08-06 17:57:48
+// At 2019-08-06 19:25:08
 
 package config