Merge "Remove orphaned code." into main