Remove deprecated classes
Merge branch 'deprecated'