diff --git a/src/PostgREST/PgStructure.hs b/src/PostgREST/PgStructure.hs
index f56ed6fe5..33fe3c633 100644
--- a/src/PostgREST/PgStructure.hs
+++ b/src/PostgREST/PgStructure.hs
@@ -20,125 +20,6 @@ import qualified Hasql.Postgres as P
 
 import Prelude
 
------------
--- foreignKeys :: QualifiedIdentifier -> H.Tx P.Postgres s (Map.Map Text ForeignKey)
--- foreignKeys table = do
---   r <- H.listEx $ [H.stmt|
---       select kcu.column_name, ccu.table_name AS foreign_table_name,
---         ccu.column_name AS foreign_column_name
---       from information_schema.table_constraints AS tc
---         join information_schema.key_column_usage AS kcu
---           on tc.constraint_name = kcu.constraint_name
---         join information_schema.constraint_column_usage AS ccu
---           on ccu.constraint_name = tc.constraint_name
---       where constraint_type = 'FOREIGN KEY'
---         and tc.table_name=? and tc.table_schema = ?
---         order by kcu.column_name
---     |] (qiName table) (qiSchema table)
---
---   return $ foldl addKey Map.empty r
---   where
---     addKey :: Map.Map Text ForeignKey -> (Text, Text, Text) -> Map.Map Text ForeignKey
---     addKey m (col, ftab, fcol) = Map.insert col (ForeignKey ftab fcol) m
---
---
--- tables :: Text -> H.Tx P.Postgres s [Table]
--- tables schema = do
---   rows <- H.listEx $
---     [H.stmt|
---       select
---         n.nspname as table_schema,
---         relname as table_name,
---         c.relkind = 'r' or (c.relkind IN ('v', 'f')) and (pg_relation_is_updatable(c.oid::regclass, false) & 8) = 8
---         or (exists (
---            select 1
---            from pg_trigger
---            where pg_trigger.tgrelid = c.oid and (pg_trigger.tgtype::integer & 69) = 69)
---         ) as insertable
---       from
---         pg_class c
---         join pg_namespace n on n.oid = c.relnamespace
---       where
---         c.relkind in ('v', 'r', 'm')
---         and n.nspname = ?
---         and (
---           pg_has_role(c.relowner, 'USAGE'::text)
---           or has_table_privilege(c.oid, 'SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER'::text)
---           or has_any_column_privilege(c.oid, 'SELECT, INSERT, UPDATE, REFERENCES'::text)
---         )
---       order by relname
---     |] schema
---   return $ map tableFromRow rows
-
-
--- columns :: QualifiedIdentifier -> H.Tx P.Postgres s [Column]
--- columns table = do
---   cols <- H.listEx $ [H.stmt|
---       select info.table_schema as schema, info.table_name as table_name,
---             info.column_name as name, info.ordinal_position as position,
---             info.is_nullable::boolean as nullable, info.data_type as col_type,
---             info.is_updatable::boolean as updatable,
---             info.character_maximum_length as max_len,
---             info.numeric_precision as precision,
---             info.column_default as default_value,
---             array_to_string(enum_info.vals, ',') as enum
---         from (
---           select table_schema, table_name, column_name, ordinal_position,
---                  is_nullable, data_type, is_updatable,
---                  character_maximum_length, numeric_precision,
---                  column_default, udt_name
---             from information_schema.columns
---            where table_schema = ? and table_name = ?
---         ) as info
---         left outer join (
---           select n.nspname as s,
---                  t.typname as n,
---                  array_agg(e.enumlabel ORDER BY e.enumsortorder) as vals
---           from pg_type t
---             join pg_enum e on t.oid = e.enumtypid
---             join pg_catalog.pg_namespace n ON n.oid = t.typnamespace
---           group by s, n
---         ) as enum_info
---         on (info.udt_name = enum_info.n)
---       order by position |]
---     (qiSchema table) (qiName table)
---
---   fks <- foreignKeys table
---   return $ map (addFK fks . columnFromRow) cols
---
---   where
---     addFK fks col = col { colFK = Map.lookup (cs . colName $ col) fks }
-
-
-primaryKeyColumns :: QualifiedIdentifier -> H.Tx P.Postgres s [Text]
-primaryKeyColumns table = do
-  r <- H.listEx $ [H.stmt|
-      WITH table_pk AS
-      ( SELECT kc.table_schema,
-               kc.table_name,
-               kc.column_name
-       FROM information_schema.table_constraints tc,
-            information_schema.key_column_usage kc
-       WHERE tc.constraint_type = 'PRIMARY KEY'
-         AND kc.table_name = tc.table_name
-         AND kc.table_schema = tc.table_schema
-         AND kc.constraint_name = tc.constraint_name
-         AND kc.table_schema = ?)
-      SELECT column_name
-      FROM table_pk
-      WHERE table_pk.table_name = ?
-      UNION
-      (
-       SELECT vcu.column_name
-       FROM information_schema.view_column_usage AS vcu
-       JOIN table_pk ON table_pk.table_schema = vcu.view_schema
-        AND table_pk.TABLE_NAME = vcu.TABLE_NAME
-        AND table_pk.column_name = vcu.column_name
-       WHERE vcu.view_schema = ?
-         AND vcu.view_name = ?
-      )
-    |] (qiSchema table) (qiName table) (qiSchema table) (qiName table)
-  return $ map runIdentity r
 
 doesProcExist :: Text -> Text -> H.Tx P.Postgres s Bool
 doesProcExist schema proc = do