Cleaning up some db calls not properly ported to new framework
Merge pull request #416 from einhverfr/master

Cleaning up some db calls not properly ported to new framework