Remove deprecated SQL features
Merge branch 'master' into teradata