Simplify/unify the Profile model(s)