Removed now obsolete CVS substitutions.