Removed unused ng-resource and cleaned up some syntax