Merge "Remove unused resources" into sc-dev