Unnecessary code
Merge branch 'master' into AngularJS

* master:
  Unnecessary code