Small updates to DB and code cleanup