remove usage of 'id' as a function argument
Merge pull request #2803 from dimagi/refactoring_id

remove usage of 'id' as a function argument