Merge "Remove unused function" into main