Remove version checks and DS Constant