Merge "Remove unused interface and implementation" into sc-dev