Removed all unused imports in controller pkg
Merge remote-tracking branch 'origin/master' into james/dev
Merging master into jack/dev while working on pmd/findbugs