First-party: Mashups cleanup.