Remove ControllerHolder
(for performance tests purposes)
Fixing 'state' field and 'getState()' method visibility issues