removed more db stuff