EXPERIMENTAL: Optimize and clean up DBUPDATE