ENYO-2525: remove unnecessary closures
ENYO-2525: remove useless comment