Merge "Delete unused function" into main