Remove more marketplace and paid-addons code.

Thought 988566 and 988567 would be two different jobs but it was all smushed together.