Take out unnecessary span tag