Removed some AngularJS dependencies. Added TODOs to remove the remainder with events