diff --git a/library/DFHackAPI.cpp b/library/DFHackAPI.cpp
index 1e09bfd20..73a4bb201 100644
--- a/library/DFHackAPI.cpp
+++ b/library/DFHackAPI.cpp
@@ -98,7 +98,7 @@ class API::Private
         DfVector *p_trans;
         DfVector *p_generic;
         DfVector *p_dwarf_names;
-        
+        /*
         string getLastNameByAddress(const uint32_t &address, bool use_generic=false);
         string getSquadNameByAddress(const uint32_t &address, bool use_generic=false);
         string getProfessionByAddress(const uint32_t &address);
@@ -106,6 +106,7 @@ class API::Private
         void getSkillsByAddress(const uint32_t &address, vector<t_skill> &);
         void getTraitsByAddress(const uint32_t &address, vector<t_trait> &);
         void getLaborsByAddress(const uint32_t &address, vector<t_labor> &);
+        */
 };
 
 API::API(const string path_to_xml)
@@ -994,7 +995,7 @@ bool API::ReadCreature(const uint32_t &index, t_creature & furball)
     MreadByte(temp + d->creature_sex_offset, furball.sex);
     return true;
 }
-
+//FIXME: this just isn't enough
 void API::InitReadNameTables()
 {
     int genericAddress = d->offset_descriptor->getAddress("language_vector");
diff --git a/library/DFTypes.h b/library/DFTypes.h
index 701d2b074..92c8ae89a 100644
--- a/library/DFTypes.h
+++ b/library/DFTypes.h
@@ -379,7 +379,7 @@ union t_creaturflags2
         
     } bits;
 };
-
+/*
 struct t_labor
 {
     string name;
@@ -426,9 +426,9 @@ struct t_skill
 
 struct t_trait
 {
-	uint16_t value;
-	string displayTxt;
-	string name;
+    uint16_t value;
+    string displayTxt;
+    string name;
     t_trait(){
         value=0;
     }
@@ -446,7 +446,7 @@ struct t_trait
         return *this;
     }
 };
-
+*/
 struct t_lastname
 {
     int names[7];