Revert "Cleanup unused code"

This reverts commit e26d295564c5b96d03dacc83f2a3ccc75c2cb594.

Conflicts:
	src/biz/bokhorst/xprivacy/PrivacyService.java