UPD: Remove unused helpers.
HYG: Code cleanup in controllers.