Remove some crufty markup