removed unused controllers
Merge branch 'develop' into testing