Cleanup of unneeded markup