Remove more marketplace and paid-addons code.
Merge pull request #22 from washort/988567

Remove more marketplace and paid-addons code.