Clean up app_core

![image](https://cloud.githubusercontent.com/assets/814861/4792338/7b2f285e-5de5-11e4-96b0-3bfc37702bae.png)

and