Small cleanup of db logic, Moved admin granting logic out of db logic

Small cleanup of db logic, Moved admin granting logic out of db logic #79