Removed all the core roles special case code. Doing it differently.