Remove more marketplace and paid-addons code.