simplify and cleanup

- condense var declarations
- organize authService better
- delete old, unused code
- remove unnecessary $apply