Remove even more traces of Marketplace (bis) (bug 974850)