cleaned up some code
removed the lazy-loading db connections