Fix corrupted merge

For some reason the last merge reinstated the >>>>>>head, etc. strings (but not the associated code) into some files (but not all). They've been removed.