diff --git a/HACKING b/HACKING
index f36f63628..55d01d0d8 100644
--- a/HACKING
+++ b/HACKING
@@ -7,12 +7,6 @@ If necessary the design of the code should reflect this preference.  If a
 pointer is to be used which will be initialised to a value, will never
 change and can never be NULL, then that pointer should be a reference.
 
-RETURN VALUES
-
-Integer return values should be used when returning success or
-failure. The C library convention of using 0 to indicate success, negative
-numbers to indicate errors, and positive values to indicate other 
-statuses should be followed.
 
 CODE FORMATTING
 
@@ -38,4 +32,4 @@ words using British English spelling and should contain only lower case
 alphabetic characters. Multiple words may be combined where they can
 reasonably be considered as a single word together. A suitable example
 would be "online" which has a distinct meaning alone, but is technically
-correctly spelt as "on line".
\ No newline at end of file
+correctly spelt as "on line".
diff --git a/TODO b/TODO
index dbeba55c2..60ecad379 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-Check Acorn works without a script
-
 Write an EntityKit TypeNode integration test. The addAttributes path needs
 to be tested.
 
@@ -7,9 +5,6 @@ Check in EntityRuleHandlertest that things behave correctly if
 EntityBuilder::installFactory fails. Same in PropertyRuleHandlertest for
 CorePropertyManager::installFactory.
 
-Fix memory leaks, so we can verify that moving MemMap to using incRef/decRef
-on parents doesn't introduce leaks.
-
 Location and MemEntity both have a timestamp, which do very close, but not
 quite the same thing. See if we can come up with a design to eliminate the
 difference?
@@ -23,10 +18,6 @@ get the SIght data in readEntity
 
 MemMap::findByType would be more efficient if we find the TypeNode probably.
 
-Implement parent refcounting in mind code.
-
-Move LocatedEntity to common, and rename
-
 Make LocatedEntity the sole base class for dealing with entities.
  * Move remaining Property methods into LocatedEntity, de-virt modProperty
    and setProperty
@@ -42,9 +33,6 @@ into LocatedEntiy.
     (Property<foo> rather than SoftProperty. This is the difference between
      using ClientPropertyManager and CorePropertyManager)
 
-Should entity class children be invisible to the client? Prevents it from
-requesting things it has never seen yet.
-
 See if we can create a Property<Map> class with extra interface, rather
 like the generic methods added to TerrainModProperty
 
diff --git a/Dockerfile b/tools/Dockerfile
similarity index 100%
rename from Dockerfile
rename to tools/Dockerfile