removes rest based model, tweaks db model
updates tests