Merge "Clean up some useless code" into sc-dev