EZP-20831: cleanup in Controller\Content