Revert Protected apps and more...
This commit reverts CM's protected apps commit, as well as:
1. Rearrange some strings
2. Fix up white space
3. Minor clean up of some things