Update DBM, fix rebase errors
Delete temp files