diff --git a/go/neo/error.go b/go/neo/error.go
index dce036e18cc16cf77732153ede77955639dd90a1..6a4a8caf710b94d7a70ff281fa82c99ae5640d44 100644
--- a/go/neo/error.go
+++ b/go/neo/error.go
@@ -1,5 +1,5 @@
-// Copyright (C) 2016-2017  Nexedi SA and Contributors.
-//                          Kirill Smelkov <kirr@nexedi.com>
+// Copyright (C) 2017  Nexedi SA and Contributors.
+//                     Kirill Smelkov <kirr@nexedi.com>
 //
 // This program is free software: you can Use, Study, Modify and Redistribute
 // it under the terms of the GNU General Public License version 3, or (at your
diff --git a/go/neo/neo.go b/go/neo/neo.go
index b05a307a62e16a3b341a044c64ee53cdfaf3f410..dd1be8353bd43f6e0dd2bf5b3e78acef0480c66a 100644
--- a/go/neo/neo.go
+++ b/go/neo/neo.go
@@ -41,6 +41,8 @@ import (
 
 const (
 	//INVALID_UUID UUID = 0
+
+	// XXX -> zodb?
 	INVALID_TID  zodb.Tid = 1<<64 - 1            // 0xffffffffffffffff
 	INVALID_OID  zodb.Oid = 1<<64 - 1
 
diff --git a/go/neo/nodetab.go b/go/neo/nodetab.go
index 41cfd0af5a0c15bd55105f8b464a3274d914a165..06241226f2db42ad33cfcf2dbce604affdb2471e 100644
--- a/go/neo/nodetab.go
+++ b/go/neo/nodetab.go
@@ -160,25 +160,6 @@ func (nt *NodeTable) StorageList() []*Node {
 }
 
 
-/* XXX closing .link on .state = DOWN?
-func (p *Peer) SetState(state NodeState) {
-	// XXX lock?
-	p.State = state
-	traceNodeChanged(nt, node)
-	if state == DOWN {
-		if p.link != nil {
-			lclose(ctx, p.link)
-			p.link = nil
-			// XXX clear p.connPool
-		}
-	}
-	nt.notify(node.NodeInfo)
-}
-*/
-
-
-
-
 // XXX doc
 func (n *Node) SetState(state NodeState) {
 	n.State = state
diff --git a/go/neo/proto-misc.go b/go/neo/proto-misc.go
index 1d297864472ba5ffcb6c60fabc17db80e7c5add9..79c4413490bfe0b9400a86c12c2d14d4bc893f19 100644
--- a/go/neo/proto-misc.go
+++ b/go/neo/proto-misc.go
@@ -1,3 +1,21 @@
+// Copyright (C) 2017  Nexedi SA and Contributors.
+//                     Kirill Smelkov <kirr@nexedi.com>
+//
+// This program is free software: you can Use, Study, Modify and Redistribute
+// it under the terms of the GNU General Public License version 3, or (at your
+// option) any later version, as published by the Free Software Foundation.
+//
+// You can also Link and Combine this program with other software covered by
+// the terms of any of the Free Software licenses or any of the Open Source
+// Initiative approved licenses and Convey the resulting work. Corresponding
+// source of such a combination shall include the source code for all other
+// software used.
+//
+// This program is distributed WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//
+// See COPYING file for full licensing terms.
+// See https://www.nexedi.com/licensing for rationale and options.
 //go:generate stringer -output zproto-str.go -type ErrorCode,NodeType,NodeState proto.go
 
 package neo
diff --git a/go/zodb/time.go b/go/zodb/time.go
index 71e5a4cc0c20a01828f9aea2163788bf24bd94b9..79b9ecdd45f086ee539b5fae605c9f7d77e482c5 100644
--- a/go/zodb/time.go
+++ b/go/zodb/time.go
@@ -24,7 +24,8 @@ import (
 	"time"
 )
 
-// TimeStamp is the same as time.Time only .String() is adjusted to be the same as in ZODB/py
+// TimeStamp is the same as time.Time only .String() is adjusted to be the same as in ZODB/py.
+//
 // XXX get rid eventually of this
 type TimeStamp struct {
 	time.Time