Removed all of the DS constants for bug #8339.