diff --git a/.gitmodules b/.gitmodules
index 66e478a..938b7a1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,12 +19,6 @@
 [submodule "ironsea_store_file"]
 	path = ironsea_store_file
 	url = ../ironsea_store_file
-[submodule "ironsea_table"]
-	path = ironsea_table
-	url = ../ironsea_table
-[submodule "ironsea_table_vector"]
-	path = ironsea_table_vector
-	url = ../ironsea_table_vector
 [submodule "mercator_data_generator"]
 	path = mercator_data_generator
 	url = ../mercator_data_generator
diff --git a/Cargo.lock b/Cargo.lock
index 1e988e1..a83b2e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -817,7 +817,6 @@ name = "ironsea_index_hashmap"
 version = "0.1.0"
 dependencies = [
  "ironsea_index 0.1.0",
- "ironsea_table 0.1.0",
  "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -830,7 +829,6 @@ dependencies = [
  "bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "ironsea_index 0.1.0",
  "ironsea_store 0.1.0",
- "ironsea_table 0.1.0",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1018,8 +1016,6 @@ dependencies = [
  "ironsea_index 0.1.0",
  "ironsea_index_hashmap 0.1.0",
  "ironsea_index_sfc_dbc 0.1.0",
- "ironsea_table 0.1.0",
- "ironsea_table_vector 0.1.0",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "measure_time 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ironsea_index b/ironsea_index
index 1231f42..36997ae 160000
--- a/ironsea_index
+++ b/ironsea_index
@@ -1 +1 @@
-Subproject commit 1231f427285bbfefd3c42e754b5511683468776b
+Subproject commit 36997ae5a387178d7046e60dba6b8a92a34a0bba
diff --git a/ironsea_index_hashmap b/ironsea_index_hashmap
index 50d60f5..af383a9 160000
--- a/ironsea_index_hashmap
+++ b/ironsea_index_hashmap
@@ -1 +1 @@
-Subproject commit 50d60f58b693f9395e120b66ecbd26d2d123478b
+Subproject commit af383a97759238c8b9e7515ff67ca5fb160e2bd2
diff --git a/ironsea_index_sfc_dbc b/ironsea_index_sfc_dbc
index 411a622..857534f 160000
--- a/ironsea_index_sfc_dbc
+++ b/ironsea_index_sfc_dbc
@@ -1 +1 @@
-Subproject commit 411a6222a1e9f2b8a941e981bf884c541dda5173
+Subproject commit 857534fd502b5e1dec8e60b4e97f0aeca0d7fc19
diff --git a/ironsea_store_file b/ironsea_store_file
index 189cc11..c28e578 160000
--- a/ironsea_store_file
+++ b/ironsea_store_file
@@ -1 +1 @@
-Subproject commit 189cc112565a902f7c1b47687b227a95e3f52104
+Subproject commit c28e578acf7c169f5d523a503f08222c80388299
diff --git a/ironsea_store_mapped_file b/ironsea_store_mapped_file
index 90abe7a..447e0b1 160000
--- a/ironsea_store_mapped_file
+++ b/ironsea_store_mapped_file
@@ -1 +1 @@
-Subproject commit 90abe7ab7ceefffabebc59a7219aa34de6351160
+Subproject commit 447e0b1c445dddc67b6500b27d11ae0e44dbb110
diff --git a/ironsea_table b/ironsea_table
deleted file mode 160000
index 277f050..0000000
--- a/ironsea_table
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 277f050873a75a65170fe55ed9b7363f2a1f8f12
diff --git a/ironsea_table_vector b/ironsea_table_vector
deleted file mode 160000
index ba883b8..0000000
--- a/ironsea_table_vector
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ba883b846966b8dc9cd74ae9b6c99ea7566f9f02
diff --git a/mercator_data_generator b/mercator_data_generator
index 1da4f8b..28fca5e 160000
--- a/mercator_data_generator
+++ b/mercator_data_generator
@@ -1 +1 @@
-Subproject commit 1da4f8b28b9836250402b744e6d3ebd45341a47e
+Subproject commit 28fca5e708e0f7ecead11bf8a61283e58dddbf1f
diff --git a/mercator_db b/mercator_db
index 6fc2cc5..cdb3746 160000
--- a/mercator_db
+++ b/mercator_db
@@ -1 +1 @@
-Subproject commit 6fc2cc5942feb314cd032b384f60d184d1af5250
+Subproject commit cdb3746a346ed5105c4dbd6f4b6a0e24800c1840
diff --git a/mercator_indexer b/mercator_indexer
index 3272590..00fa1e8 160000
--- a/mercator_indexer
+++ b/mercator_indexer
@@ -1 +1 @@
-Subproject commit 3272590d24f2c1100f92877415aa42be209465bb
+Subproject commit 00fa1e8d96f08eebb167368ace014a9e5610079a
diff --git a/mercator_parser b/mercator_parser
index 8dd9250..926b879 160000
--- a/mercator_parser
+++ b/mercator_parser
@@ -1 +1 @@
-Subproject commit 8dd9250dbb13e646383ff10df16ab1fe7b63e9e3
+Subproject commit 926b879426af72b9d7f3d9c39a36de98a7a68bb9
diff --git a/mercator_service b/mercator_service
index 5cbd2a0..a6865c6 160000
--- a/mercator_service
+++ b/mercator_service
@@ -1 +1 @@
-Subproject commit 5cbd2a0b69b79472cc701dd382d55f80129732a4
+Subproject commit a6865c6cbdaf0ec70eccc823012027828cccc2aa