Cleaning things up for a DBO release.