remove db connect
merge