Remove unused variables and arguments
Merge branch 'master' of github.com:systemed/iD