db, code cleanup
db, code cleanup