Angular cleanup

Tests should be fixed now. 

![image](https://f.cloud.github.com/assets/479722/2417899/cbe02060-ab2e-11e3-8e0c-3037eb37bc19.png)