unused imports & classes removed, dependencies cleaned up
Merge branch 'stuart_clean' into Testing_Release_1.2
removed unused imports & dependencies and unused classes
Merge branch 'stuart_clean' into Testing_Release_1.2