Merge "Remove unused dependency" into main