removed a few static database calls