Clean-up before moving to $resources
Moved to using Resource instead of $http