adding db in and removing old class
cleanups