Get rid of DBS2 code.
Merge pull request #4212 from HassenRiahi/RemoveDBS2Code

Get rid of DBS2 code.