Merge "Remove dead code." into main