Merge "Remove unused shelf code" into sc-dev