Post cleanup of topapps, some parts were not removed with Changeset 2908