First part of the DboSource cleanup.