removed all dbcalls from main class