Delete old stuff and format a little in state
Move ngResource dependency to the right spot
Minor cleanup in morph service