Merge "Remove some dead code" into main