Merge "Clean up some dead code" into main