minor
Remove the Controller class
Scope: re-make Scope.context final
Remove debug prints