Remove 1.5 and 2.5 and DS from helper file