Remove Separate Role Model
Merge branch 'Remove-Separate-Role-Model'