remove TYPE_SELECT deprecated Constant that marked will go away in 2.1
Merge pull request #5869