More DS and 1.5 and 2.5 code removal