Merge "Remove no longer used configuration." into main