Merge "Remove unused methods" into main