diff --git a/Makefile b/Makefile
index a6af1f6..c04a643 100755
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,22 @@ AUTODMG := /Applications/AutoDMG.app/Contents/MacOS/AutoDMG
 
 default: output.dmg
 
+.PHONY: prepare
+
 packages:
 	cd osx-privacy-pkg && make
 
 clean:
 	rm -f osx-privacy-pkg/*.pkg output.dmg
 
-output.dmg: packages
+prepare:
+	sudo xcodebuild -license accept
+	sudo pmset -a sleep 180
+	sudo pmset -a displaysleep 180
 	$(AUTODMG) update
-	$(AUTODMG) \
+
+output.dmg: packages prepare
+	-$(AUTODMG) \
 		--log-level 7 \
 		--logfile - \
 		build \
@@ -18,8 +25,31 @@ output.dmg: packages
 		-u -U \
 		-o /tmp/output.dmg \
 		"/Applications/Install OS X El Capitan.app" \
+		/Applications/Chromium.app \
 		/Applications/Xcode.app \
 		/Applications/AutoDMG.app \
+		/Applications/Little\ Snitch\ Installer.app \
 		"/Applications/Install OS X El Capitan.app" \
-		$(PWD)/osx-privacy-pkg/*.pkg \
-		$(PWD)/users/*.pkg && mv /tmp/output.dmg ./output.dmg
+		$(PWD)/../extrapackages/*.pkg \
+		$(PWD)/users/*.pkg \
+		$(PWD)/clearRegistration.pkg \
+		$(PWD)/osx-privacy-pkg/*.pkg && \
+		cp /tmp/output.dmg $(PWD)/$@
+
+simple.dmg: prepare
+	$(AUTODMG) \
+		--log-level 7 \
+		build \
+		-n "root" \
+		-u -U \
+		-o /tmp/output.dmg \
+		"/Applications/Install OS X El Capitan.app" \
+		/Applications/Chromium.app \
+		/Applications/Xcode.app \
+		/Applications/AutoDMG.app \
+		/Applications/Little\ Snitch\ Installer.app \
+		"/Applications/Install OS X El Capitan.app" \
+		$(PWD)/../extrapackages/*.pkg \
+		$(PWD)/users/*.pkg \
+		$(PWD)/clearRegistration.pkg \
+		&& cp /tmp/output.dmg $(PWD)/$@
diff --git a/clearRegistration.pkg b/clearRegistration.pkg
new file mode 100644
index 0000000..cffaacd
Binary files /dev/null and b/clearRegistration.pkg differ
diff --git a/osx-privacy-pkg/scripts/postinstall b/osx-privacy-pkg/scripts/postinstall
index b44eaee..8415846 100755
--- a/osx-privacy-pkg/scripts/postinstall
+++ b/osx-privacy-pkg/scripts/postinstall
@@ -7,9 +7,18 @@ FILES=""
 ## Remove Internet Providers / Sharing / iCloud
 FILES+=" 
 	/System/Library/PreferencePanes/iCloudPref.prefPane
-	/System/Library/InternetAccounts
+	/usr/libexec/sharingd
+	/System/Library/InternetAccounts/iCloud.iaplugin
+	/System/Library/CoreServices/cloudpaird
+	/System/Library/LaunchAgents/com.apple.cloudpaird.plist
+	/System/Library/PrivateFrameworks/CloudDocsDaemon.framework/Versions/A/Support/bird
+	/System/Library/LaunchAgents/com.apple.CommCenter-osx.plist
+	/System/Library/LaunchDaemons/com.apple.CommCenterRootHelper.plist
 "
 
+#	/System/Library/PrivateFrameworks/SafariShared.framework/Versions/A/XPCServices/com.apple.Safari.SearchHelper.xpc
+#	/System/Library/PrivateFrameworks/SafariShared.framework/Versions/A/XPCServices/com.apple.Safari.SocialHelper.xpc
+
 ## Remove all crash reporting daemons
 FILES+="
 	/System/Library/LaunchAgents/com.apple.ReportPanic.plist
@@ -25,27 +34,75 @@ FILES+="
 	/System/Library/CoreServices/SubmitDiagInfo
 	/System/Library/LaunchAgents/com.apple.diagnostics_agent.plist
 	/System/Library/CoreServices/diagnostics_agent
+	/usr/sbin/spindump
+	/usr/libexec/spindump_agent
+	/System/Library/LaunchAgents/com.apple.spindump_agent.plist
 "
 
-## Remove all Spotlight network support
+## Remove Spotlight network support
 FILES+="
 	/System/Library/LaunchAgents/com.apple.metadata.SpotlightNetHelper.plist
-	/System/Library/PrivateFrameworks/ParsecUI.framework
 "
 
 ## Remove CommCenter
-FILES+="
-	/System/Library/Frameworks/CoreTelephony.framework
-	/System/Library/LaunchAgents/com.apple.CommCenter-osx.plist
-	/System/Library/LaunchDaemons/com.apple.CommCenterRootHelper.plist
-"
+#FILES+="
+#	/System/Library/Frameworks/CoreTelephony.framework
+#"
 
 ## remove spotlight suggestions/helper
+#FILES+="
+#	/System/Library/LaunchAgents/com.apple.suggestd.plist
+#	/System/Library/PrivateFrameworks/CoreSuggestions.framework
+#"
+
+# remove phone-home xpc services
 FILES+="
-	/System/Library/LaunchAgents/com.apple.suggestd.plist
-	/System/Library/PrivateFrameworks/CoreSuggestions.framework
+	/System/Library/PrivateFrameworks/GeoServices.framework/Versions/A/XPCServices/com.apple.geod.xpc
+	/System/Library/Frameworks/AddressBook.framework/Versions/A/XPCServices/com.apple.AddressBook.ContactsAccountsService.xpc
+	/System/Library/Frameworks/AddressBook.framework/Versions/A/XPCServices/com.apple.AddressBook.FaceTimeService.xpc
+	/System/Library/Frameworks/AddressBook.framework/Versions/A/XPCServices/com.apple.AddressBook.InternetAccountsBridge.xpc
+"
+
+# commercekit contains some xpc services that phone home,
+# but without MAS support the system doesn't need any of it.
+# disabled for suspected finder crash
+
+#FILES+="
+#	/System/Library/PrivateFrameworks/CommerceKit.framework
+#"
+
+# SocialPushAgent:
+FILES+="
+	/System/Library/CoreServices/SocialPushAgent.app
+"
+
+FILES+="
+	/System/Library/CoreServices/Software?Update.app/Contents/Resources/softwareupdated
+	/usr/libexec/UserEventAgent
+	/System/Library/PrivateFrameworks/IMFoundation.framework/XPCServices/IMRemoteURLConnectionAgent.xpc/Contents/MacOS/IMRemoteURLConnectionAgent
+	/System/Library/PrivateFrameworks/ApplePushService.framework/apsd
+	/usr/libexec/locationd
+	/System/Library/PrivateFrameworks/CommerceKit.framework/Versions/A/Resources/storeaccountd
+	/System/Library/CoreServices/Stocks.app/Contents/PlugIns/com.apple.ncplugin.stocks.appex
+	/System/Library/CoreServices/AppleIDAuthAgent
+	/System/Library/PrivateFrameworks/AssistantServices.framework/assistantd
+	/System/Library/PrivateFrameworks/HelpData.framework/Versions/A/Resources/helpd
+"
+
+## remove spyware apps (safari and mail and iTunes all phone home)
+## facetime/messages/photos depend on APNS/iCloud, so unavailable
+
+FILES+="
+	/Applications/Safari.app
+	/Applications/Mail.app
+	/Applications/Messages.app
+	/Applications/Photos.app
+	/Applications/FaceTime.app
+	/Applications/iTunes.app
+	/Applications/Maps.app
+	/Applications/App?Store.app
 "
 
 for FILE in $FILES ; do
-	rm -rf "$3/$FILE"
+	rm -rfv "$3/$FILE"
 done
diff --git a/setup b/setup
new file mode 100755
index 0000000..f9c6800
--- /dev/null
+++ b/setup
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo xcodebuild -license accept
+sudo pmset -a sleep 180
+sudo pmset -a displaysleep 180