Consolidate old attributes and metadata entities.
Better cleanup in CI