Merge "Remove empty method" into main