Removing unnecessary <span> tags