Merge "Cleanup dead code." into main