Remove deprecated classes
Merge branch 'refactor/code-clean' into develop