[EC/JEB] [57352526] code cleanup