remove additional 'id' function arguments
Merge pull request #2804 from dimagi/refactoring-id

remove additional 'id' function arguments