Removing unnecessary markup