Simplification of the model - removed StoreRole, UserRole, UserStore classes and related services, tests etc.