Merge "Clean up some dump code." into sc-dev