Update db, version and some cleanup