Removed unused and deprecated constants.
Merge pull request #1578 from ADmad/3.0

Removed unused and deprecated constants.