diff --git a/src/matrix.js b/src/matrix.js
index a3ea7ae45..ea885b932 100644
--- a/src/matrix.js
+++ b/src/matrix.js
@@ -1,5 +1,6 @@
 /*
-Copyright 2015, 2016, 2017 OpenMarket Ltd
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/src/sync-accumulator.js b/src/sync-accumulator.js
index 786841318..ddac68950 100644
--- a/src/sync-accumulator.js
+++ b/src/sync-accumulator.js
@@ -125,10 +125,6 @@ class SyncAccumulator {
                     delete this.inviteRooms[roomId];
                 }
                 // (3)
-                // TODO: Check that join 'state' is the same if you leave then
-                //       rejoin. We need to know if Synapse is instead returning
-                //       a delta from the old leave state. If it is, this means
-                //       we can NEVER delete 'leave' room data :/
                 this._accumulateJoinState(roomId, data);
                 break;
             case "leave":
@@ -297,7 +293,6 @@ class SyncAccumulator {
             // about any previous room being in 'invite' or 'join' so we can
             // just omit mentioning it at all, even if it has previously come
             // down /sync.
-            // TODO: Check if full state is given upon rejoin.
             leave: {},
         };
         Object.keys(this.inviteRooms).forEach((roomId) => {