remove scope from controller functions
Merge branch 'scope-removal'

* scope-removal:
  remove scope from controller functions