Merge "Remove unused Factory interface" into main