Second part of the DboSource cleanup.