Remove DS, and 1.5/2.5 code