remove sql
fix on dhs
start test suit for DB