[ENYO-12] few more @method cleanup