diff --git a/src/bind_faction.c b/src/bind_faction.c
index 081bb6eca..82e58dc7f 100644
--- a/src/bind_faction.c
+++ b/src/bind_faction.c
@@ -578,15 +578,6 @@ void tolua_faction_open(lua_State * L)
       tolua_function(L, TOLUA_CAST "create", tolua_faction_create);
       tolua_function(L, TOLUA_CAST "get", tolua_faction_get);
       tolua_function(L, TOLUA_CAST "destroy", tolua_faction_destroy);
-#ifdef TODO
-      def("faction_origin", &faction_getorigin,
-        pure_out_value(_2) + pure_out_value(_3)),.def_readwrite("subscription",
-        &faction::subscription)
-
-        .property("x", &faction_getorigin_x, &faction_setorigin_x)
-        .property("y", &faction_getorigin_y, &faction_setorigin_y)
-
-#endif
       tolua_function(L, TOLUA_CAST "add_notice", &tolua_faction_addnotice);
 
       tolua_variable(L, TOLUA_CAST "objects", tolua_faction_get_objects,
diff --git a/src/bind_ship.c b/src/bind_ship.c
index affc024ee..1c94a232d 100644
--- a/src/bind_ship.c
+++ b/src/bind_ship.c
@@ -219,7 +219,6 @@ void tolua_ship_open(lua_State * L)
         .property("maxsize", &ship_maxsize)
         .def_readwrite("damage", &ship::damage)
         .def_readwrite("size", &ship::size)
-        .def_readwrite("coast", &ship::coast)
 #endif
         tolua_variable(L, TOLUA_CAST "objects", tolua_ship_get_objects, 0);
 
diff --git a/src/kernel/config.c b/src/kernel/config.c
index b1f1e4377..9355234e7 100644
--- a/src/kernel/config.c
+++ b/src/kernel/config.c
@@ -1632,9 +1632,6 @@ void kernel_done(void)
     gc_done();
 }
 
-/* TODO: soll hier weg */
-extern struct attrib_type at_shiptrail;
-
 attrib_type at_germs = {
     "germs",
     DEFAULT_INIT,
@@ -2168,6 +2165,7 @@ bool has_limited_skills(const struct unit * u)
 void attrib_init(void)
 {
     /* Alle speicherbaren Attribute müssen hier registriert werden */
+    at_register(&at_speedup);
     at_register(&at_shiptrail);
     at_register(&at_familiar);
     at_register(&at_familiarmage);
@@ -2211,7 +2209,6 @@ void attrib_init(void)
     at_register(&at_germs);
 
     at_deprecate("xontormiaexpress", a_readint);    /* required for old datafiles */
-    at_register(&at_speedup);
 }
 
 void kernel_init(void)
diff --git a/src/move.h b/src/move.h
index 27704d4a4..8e3d63e7f 100644
--- a/src/move.h
+++ b/src/move.h
@@ -32,6 +32,7 @@ extern "C" {
     struct building_type;
 
     extern struct attrib_type at_speedup;
+    extern struct attrib_type at_shiptrail;
 
     /* die Zahlen sind genau äquivalent zu den race Flags */
 #define MV_CANNOTMOVE     (1<<5)