Remove unneeded class.
Merge branch 'develop'