Remove unnecessary markup