Remove uneeded markup