Merge "Remove unused resources" into sc-v2-dev