removing deprecated constants
Merge pull request #506 from willtp87/7.x.post-release

removing deprecated constants