Merge "Remove unused code" into main