Merge "Clean up dead code." into main