ENYO-2629: remove p elements