Merge "remove obsolete entries" into sc-dev