Refactoring only: remove [Id] field from ForeignStubs