removed database stuff
merge