- Major cleanup of marketplace-metadata