Remove unneeded markup