more changes due to umwanted markup