remove $args arrays and refactor to use subrequests as needed
Merge pull request #2033 from craigh/Usersmodule-removeargs

remove $args arrays and refactor to use subrequests as needed