Cleaning up.
Merge branch 'dbx' into testing