First pass in removing restangular