Remove deprecate class
Merge branch 'refactor/delete-deprecated'