Commenting blocks on ControllerHandler.cpp