Big clean up of the globalObject model. Everything is now back to using angular.js