remove not used class
Merge branch 'master' into develop