fixed use of model/db, which is deprecated
routes and roles
no longer used
merge with develop