Oops, remove old cruft imported to CVS.