cleanup
db utils upgraded
db utils unit tests updated