Remove even more traces of Marketplace (bug 974850)