Update to new crud model, clean up some more profile controller code
More code updates