Revert "addControllerClass"

This reverts commit a0359d2155f4b9c7c8c444f9a6e2b5b9c3f2805f.