diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 120000
index f1a49fe..0000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1 +0,0 @@
-CODE_OF_MERIT.md
\ No newline at end of file
diff --git a/CODE_OF_MERIT.md b/CODE_OF_MERIT.md
index 4761273..149ec81 100644
--- a/CODE_OF_MERIT.md
+++ b/CODE_OF_MERIT.md
@@ -55,4 +55,5 @@ to the project. Any intent to deviate the project from its original purpose
 of existence will constitute grounds for remedial action which may include
 expulsion from the project.
 
-This document is based upon the Code of Merit (http://code-of-merit.org), version 1.0.
+This document is based upon the Code of Merit version 1.0 (Dec 4 2018).
+(https://web.archive.org/web/20181204203029/http://code-of-merit.org/)
diff --git a/hkexsh/hkexsh.go b/hkexsh/hkexsh.go
index 701446a..104bca8 100755
--- a/hkexsh/hkexsh.go
+++ b/hkexsh/hkexsh.go
@@ -115,8 +115,6 @@ func copyBuffer(dst io.Writer, src io.Reader, buf []byte) (written int64, err er
 	// or tunnel traffic indicator - note we cannot just spawn a goroutine
 	// here, as copyBuffer() returns after each burst of data. Scope must
 	// outlive individual copyBuffer calls).
-	// (Note that since this custom copyBuffer func is used only by
-	// the hkexsh client, it should eventually be moved to client.)
 	escs := escSeqs{
 		'i': func(io.Writer) { os.Stdout.Write([]byte("\x1b[s\x1b[2;1H\x1b[1;31m[HKEXSH]\x1b[39;49m\x1b[u")) },
 		't': func(io.Writer) { os.Stdout.Write([]byte("\x1b[1;32m[HKEXSH]\x1b[39;49m")) },