diff --git a/src/indexer.cc b/src/indexer.cc
index bd4f9a30..ff81c4eb 100644
--- a/src/indexer.cc
+++ b/src/indexer.cc
@@ -21,15 +21,6 @@ namespace {
 
 const bool kIndexStdDeclarations = true;
 
-std::vector<std::string> BuildTypeDesc(clang::Cursor cursor) {
-  std::vector<std::string> type_desc;
-  for (clang::Cursor arg : cursor.get_arguments()) {
-    if (arg.get_kind() == CXCursor_ParmDecl)
-      type_desc.push_back(arg.get_type_description());
-  }
-  return type_desc;
-}
-
 void AddFuncRef(std::vector<IndexFuncRef>* result, IndexFuncRef ref) {
   if (!result->empty() && (*result)[result->size() - 1] == ref)
     return;
@@ -106,16 +97,23 @@ struct NamespaceHelper {
 struct ConstructorCache {
   using Usr = std::string;
   struct Constructor {
-    std::vector<std::string> param_type_desc;
     Usr usr;
+    std::vector<std::string> param_type_desc;
   };
   std::unordered_map<Usr, std::vector<Constructor>> constructors_;
 
   // This should be called whenever there is a constructor declaration.
   void NotifyConstructor(clang::Cursor ctor_cursor) {
-    Constructor ctor;
-    ctor.usr = ctor_cursor.get_usr();
-    ctor.param_type_desc = BuildTypeDesc(ctor_cursor);
+    auto build_type_desc = [](clang::Cursor cursor) {
+      std::vector<std::string> type_desc;
+      for (clang::Cursor arg : cursor.get_arguments()) {
+        if (arg.get_kind() == CXCursor_ParmDecl)
+          type_desc.push_back(arg.get_type_description());
+      }
+      return type_desc;
+    };
+
+    Constructor ctor{ctor_cursor.get_usr(), build_type_desc(ctor_cursor)};
 
     // Insert into |constructors_|.
     std::string type_usr = ctor_cursor.get_semantic_parent().get_usr();
@@ -1124,17 +1122,6 @@ void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) {
       AddDeclTypeUsages(db, decl_cursor, decl->semanticContainer,
                         decl->lexicalContainer);
 
-      func->is_constructor =
-          decl->entityInfo->kind == CXIdxEntity_CXXConstructor;
-
-      // Add parameter list if we haven't seen this function before.
-      //
-      // note: If the function has no parameters, this block will be rerun
-      // every time we see the function. Performance should hopefully be fine
-      // but it may be a possible optimization.
-      if (func->parameter_type_descriptions.empty())
-        func->parameter_type_descriptions = BuildTypeDesc(decl_cursor);
-
       // Add definition or declaration. This is a bit tricky because we treat
       // template specializations as declarations, even though they are
       // technically definitions.
diff --git a/src/indexer.h b/src/indexer.h
index 888cb2f1..21a857e7 100644
--- a/src/indexer.h
+++ b/src/indexer.h
@@ -329,14 +329,6 @@ struct IndexFunc {
     std::vector<Range> param_spellings;
   };
 
-  // True iff this is a constructor.
-  bool is_constructor = false;
-  // Type description for each parameter. This is stored in the sharable
-  // section (instead of the def) because it is while indexing cross-refs for
-  // constructors, which means the def may not yet be available if the function
-  // is forward-declared.
-  std::vector<std::string> parameter_type_descriptions;
-
   // Places the function is forward-declared.
   std::vector<Declaration> declarations;
 
diff --git a/src/serializer.cc b/src/serializer.cc
index 2cb6ebfa..b573cbcf 100644
--- a/src/serializer.cc
+++ b/src/serializer.cc
@@ -86,8 +86,6 @@ void Reflect(TVisitor& visitor, IndexFunc& value) {
   REFLECT_MEMBER2("usr", value.def.usr);
   REFLECT_MEMBER2("short_name", value.def.short_name);
   REFLECT_MEMBER2("detailed_name", value.def.detailed_name);
-  REFLECT_MEMBER2("is_constructor", value.is_constructor);
-  REFLECT_MEMBER2("parameter_type_descriptions", value.parameter_type_descriptions);
   REFLECT_MEMBER2("declarations", value.declarations);
   REFLECT_MEMBER2("definition_spelling", value.def.definition_spelling);
   REFLECT_MEMBER2("definition_extent", value.def.definition_extent);
diff --git a/tests/constructors/constructor.cc b/tests/constructors/constructor.cc
index 41361a97..121331a3 100644
--- a/tests/constructors/constructor.cc
+++ b/tests/constructors/constructor.cc
@@ -27,7 +27,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@Foo#",
       "short_name": "Foo",
       "detailed_name": "void Foo::Foo()",
-      "is_constructor": true,
       "definition_spelling": "3:3-3:6",
       "definition_extent": "3:3-3:11",
       "declaring_type": 0,
@@ -37,7 +36,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "6:6-6:9",
       "definition_extent": "6:1-9:2",
       "callees": ["~0@7:7-7:8", "0@8:17-8:20"]
diff --git a/tests/constructors/destructor.cc b/tests/constructors/destructor.cc
index 899a6d35..68b1dae8 100644
--- a/tests/constructors/destructor.cc
+++ b/tests/constructors/destructor.cc
@@ -32,7 +32,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@Foo#",
       "short_name": "Foo",
       "detailed_name": "void Foo::Foo()",
-      "is_constructor": true,
       "definition_spelling": "3:3-3:6",
       "definition_extent": "3:3-3:11",
       "declaring_type": 0,
@@ -42,7 +41,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@~Foo#",
       "short_name": "~Foo",
       "detailed_name": "void Foo::~Foo() noexcept",
-      "is_constructor": false,
       "definition_spelling": "4:3-4:7",
       "definition_extent": "4:3-4:12",
       "declaring_type": 0
@@ -51,7 +49,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "7:6-7:9",
       "definition_extent": "7:1-9:2",
       "callees": ["~0@8:7-8:8"]
diff --git a/tests/constructors/implicit_constructor.cc b/tests/constructors/implicit_constructor.cc
index 0502e281..6bb4a860 100644
--- a/tests/constructors/implicit_constructor.cc
+++ b/tests/constructors/implicit_constructor.cc
@@ -26,7 +26,6 @@ OUTPUT:
       "usr": "c:@S@Type@F@Type#",
       "short_name": "Type",
       "detailed_name": "void Type::Type()",
-      "is_constructor": true,
       "definition_spelling": "2:3-2:7",
       "definition_extent": "2:3-2:12",
       "declaring_type": 0,
@@ -36,7 +35,6 @@ OUTPUT:
       "usr": "c:@F@Make#",
       "short_name": "Make",
       "detailed_name": "void Make()",
-      "is_constructor": false,
       "definition_spelling": "5:6-5:10",
       "definition_extent": "5:1-8:2",
       "callees": ["~0@6:8-6:11"]
diff --git a/tests/constructors/invalid_reference.cc b/tests/constructors/invalid_reference.cc
index eb54b268..fb000dfe 100644
--- a/tests/constructors/invalid_reference.cc
+++ b/tests/constructors/invalid_reference.cc
@@ -21,7 +21,6 @@ OUTPUT:
       "usr": "c:@S@Foo@FT@>1#TFoo#v#",
       "short_name": "Foo",
       "detailed_name": "void Foo::Foo()",
-      "is_constructor": true,
       "definition_spelling": "4:6-4:9",
       "definition_extent": "4:1-4:11",
       "declaring_type": 0
diff --git a/tests/constructors/make_functions.cc b/tests/constructors/make_functions.cc
index 2c2cd446..ac904e36 100644
--- a/tests/constructors/make_functions.cc
+++ b/tests/constructors/make_functions.cc
@@ -50,7 +50,6 @@ OUTPUT: make_functions.h
       "usr": "c:@S@Foobar@F@Foobar#",
       "short_name": "Foobar",
       "detailed_name": "void Foobar::Foobar()",
-      "is_constructor": true,
       "definition_spelling": "5:3-5:9",
       "definition_extent": "5:3-5:14",
       "declaring_type": 1
@@ -59,8 +58,6 @@ OUTPUT: make_functions.h
       "usr": "c:@S@Foobar@F@Foobar#I#",
       "short_name": "Foobar",
       "detailed_name": "void Foobar::Foobar(int)",
-      "is_constructor": true,
-      "parameter_type_descriptions": ["int"],
       "definition_spelling": "6:3-6:9",
       "definition_extent": "6:3-6:17",
       "declaring_type": 1
@@ -69,8 +66,6 @@ OUTPUT: make_functions.h
       "usr": "c:@S@Foobar@F@Foobar#&&I#*$@S@Bar#*b#",
       "short_name": "Foobar",
       "detailed_name": "void Foobar::Foobar(int &&, Bar *, bool *)",
-      "is_constructor": true,
-      "parameter_type_descriptions": ["int &&", "Bar *", "bool *"],
       "definition_spelling": "7:3-7:9",
       "definition_extent": "7:3-7:32",
       "declaring_type": 1
@@ -79,8 +74,6 @@ OUTPUT: make_functions.h
       "usr": "c:@S@Foobar@F@Foobar#I#*$@S@Bar#*b#",
       "short_name": "Foobar",
       "detailed_name": "void Foobar::Foobar(int, Bar *, bool *)",
-      "is_constructor": true,
-      "parameter_type_descriptions": ["int", "Bar *", "bool *"],
       "definition_spelling": "8:3-8:9",
       "definition_extent": "8:3-8:30",
       "declaring_type": 1
@@ -123,8 +116,6 @@ OUTPUT: make_functions.cc
       "usr": "c:@FT@>2#T#pTMakeUnique#P&&t0.1#*t0.0#",
       "short_name": "MakeUnique",
       "detailed_name": "T *MakeUnique(Args &&...)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["Args &&..."],
       "definition_spelling": "4:4-4:14",
       "definition_extent": "4:1-6:2",
       "callers": ["2@14:3-14:13", "2@15:3-15:13", "2@16:3-16:13"]
@@ -133,8 +124,6 @@ OUTPUT: make_functions.cc
       "usr": "c:@FT@>2#T#pTmaKE_NoRefs#Pt0.1#*t0.0#",
       "short_name": "maKE_NoRefs",
       "detailed_name": "T *maKE_NoRefs(Args...)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["Args..."],
       "definition_spelling": "9:4-9:15",
       "definition_extent": "9:1-11:2",
       "callers": ["2@17:3-17:14"]
@@ -143,29 +132,24 @@ OUTPUT: make_functions.cc
       "usr": "c:@F@caller22#",
       "short_name": "caller22",
       "detailed_name": "void caller22()",
-      "is_constructor": false,
       "definition_spelling": "13:6-13:14",
       "definition_extent": "13:1-18:2",
       "callees": ["0@14:3-14:13", "0@15:3-15:13", "0@16:3-16:13", "1@17:3-17:14"]
     }, {
       "id": 3,
       "usr": "c:@S@Foobar@F@Foobar#",
-      "is_constructor": false,
       "callers": ["~-1@14:3-14:13"]
     }, {
       "id": 4,
       "usr": "c:@S@Foobar@F@Foobar#I#",
-      "is_constructor": false,
       "callers": ["~-1@15:3-15:13"]
     }, {
       "id": 5,
       "usr": "c:@S@Foobar@F@Foobar#&&I#*$@S@Bar#*b#",
-      "is_constructor": false,
       "callers": ["~-1@16:3-16:13"]
     }, {
       "id": 6,
       "usr": "c:@S@Foobar@F@Foobar#I#*$@S@Bar#*b#",
-      "is_constructor": false,
       "callers": ["~-1@17:3-17:14"]
     }],
   "vars": [{
diff --git a/tests/declaration_vs_definition/func.cc b/tests/declaration_vs_definition/func.cc
index 403bdc86..2af68de7 100644
--- a/tests/declaration_vs_definition/func.cc
+++ b/tests/declaration_vs_definition/func.cc
@@ -12,7 +12,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "1:6-1:9",
           "extent": "1:1-1:11",
diff --git a/tests/declaration_vs_definition/func_associated_function_params.cc b/tests/declaration_vs_definition/func_associated_function_params.cc
index d5a1fca6..8f13314e 100644
--- a/tests/declaration_vs_definition/func_associated_function_params.cc
+++ b/tests/declaration_vs_definition/func_associated_function_params.cc
@@ -12,8 +12,6 @@ OUTPUT:
       "usr": "c:@F@foo#I#I#",
       "short_name": "foo",
       "detailed_name": "int foo(int, int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int", "int"],
       "declarations": [{
           "spelling": "1:5-1:8",
           "extent": "1:1-1:18",
diff --git a/tests/declaration_vs_definition/method.cc b/tests/declaration_vs_definition/method.cc
index 501e6fba..61fb0a19 100644
--- a/tests/declaration_vs_definition/method.cc
+++ b/tests/declaration_vs_definition/method.cc
@@ -24,7 +24,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@declonly#",
       "short_name": "declonly",
       "detailed_name": "void Foo::declonly()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "2:8-2:16",
           "extent": "2:3-2:18",
@@ -36,7 +35,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@purevirtual#",
       "short_name": "purevirtual",
       "detailed_name": "void Foo::purevirtual()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "3:16-3:27",
           "extent": "3:3-3:33",
@@ -48,7 +46,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@def#",
       "short_name": "def",
       "detailed_name": "void Foo::def()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "4:8-4:11",
           "extent": "4:3-4:13",
diff --git a/tests/function_declaration.cc b/tests/function_declaration.cc
index 909d2bce..1ffc9c8d 100644
--- a/tests/function_declaration.cc
+++ b/tests/function_declaration.cc
@@ -8,8 +8,6 @@ OUTPUT:
       "usr": "c:@F@foo#I#I#",
       "short_name": "foo",
       "detailed_name": "void foo(int, int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int", "int"],
       "declarations": [{
           "spelling": "1:6-1:9",
           "extent": "1:1-1:23",
diff --git a/tests/function_declaration_definition.cc b/tests/function_declaration_definition.cc
index d38c5022..daaf1a76 100644
--- a/tests/function_declaration_definition.cc
+++ b/tests/function_declaration_definition.cc
@@ -10,7 +10,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "1:6-1:9",
           "extent": "1:1-1:11",
diff --git a/tests/function_definition.cc b/tests/function_definition.cc
index 405a7357..4def754f 100644
--- a/tests/function_definition.cc
+++ b/tests/function_definition.cc
@@ -8,7 +8,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "1:6-1:9",
       "definition_extent": "1:1-1:14"
     }]
diff --git a/tests/inheritance/function_override.cc b/tests/inheritance/function_override.cc
index 840939a0..26709c7d 100644
--- a/tests/inheritance/function_override.cc
+++ b/tests/inheritance/function_override.cc
@@ -34,7 +34,6 @@ OUTPUT:
       "usr": "c:@S@Root@F@foo#",
       "short_name": "foo",
       "detailed_name": "void Root::foo()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "2:16-2:19",
           "extent": "2:3-2:21",
@@ -47,7 +46,6 @@ OUTPUT:
       "usr": "c:@S@Derived@F@foo#",
       "short_name": "foo",
       "detailed_name": "void Derived::foo()",
-      "is_constructor": false,
       "definition_spelling": "5:8-5:11",
       "definition_extent": "5:3-5:25",
       "declaring_type": 1,
diff --git a/tests/inheritance/interface_pure_virtual.cc b/tests/inheritance/interface_pure_virtual.cc
index b991b6cb..be3f3041 100644
--- a/tests/inheritance/interface_pure_virtual.cc
+++ b/tests/inheritance/interface_pure_virtual.cc
@@ -20,7 +20,6 @@ OUTPUT:
       "usr": "c:@S@IFoo@F@foo#",
       "short_name": "foo",
       "detailed_name": "void IFoo::foo()",
-      "is_constructor": false,
       "definition_spelling": "2:16-2:19",
       "definition_extent": "2:3-2:28",
       "declaring_type": 0
diff --git a/tests/macros/complex.cc b/tests/macros/complex.cc
index 20bfddbf..c0447a62 100644
--- a/tests/macros/complex.cc
+++ b/tests/macros/complex.cc
@@ -19,7 +19,6 @@ OUTPUT:
       "usr": "c:@F@make1#",
       "short_name": "make1",
       "detailed_name": "int make1()",
-      "is_constructor": false,
       "definition_spelling": "6:5-6:10",
       "definition_extent": "6:1-8:2",
       "callers": ["1@12:5-12:10"]
@@ -28,7 +27,6 @@ OUTPUT:
       "usr": "c:@F@a#",
       "short_name": "a",
       "detailed_name": "int a()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "12:1-12:20",
           "extent": "12:1-12:20",
diff --git a/tests/macros/foo.cc b/tests/macros/foo.cc
index f0518d5d..ebd3083f 100644
--- a/tests/macros/foo.cc
+++ b/tests/macros/foo.cc
@@ -25,8 +25,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@Foo#&&$@S@Foo#",
       "short_name": "Foo",
       "detailed_name": "void Foo::Foo(Foo &&)",
-      "is_constructor": true,
-      "parameter_type_descriptions": ["Foo &&"],
       "definition_spelling": "5:12-5:15",
       "definition_extent": "5:12-5:16",
       "declaring_type": 0
diff --git a/tests/method_declaration.cc b/tests/method_declaration.cc
index dd325e0d..4f3c5326 100644
--- a/tests/method_declaration.cc
+++ b/tests/method_declaration.cc
@@ -24,7 +24,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@foo#",
       "short_name": "foo",
       "detailed_name": "void Foo::foo()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "2:8-2:11",
           "extent": "2:3-2:13",
diff --git a/tests/method_definition.cc b/tests/method_definition.cc
index fd51b1b6..51e874aa 100644
--- a/tests/method_definition.cc
+++ b/tests/method_definition.cc
@@ -22,7 +22,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@foo#1",
       "short_name": "foo",
       "detailed_name": "void Foo::foo() const",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "2:8-2:11",
           "extent": "2:3-2:19",
diff --git a/tests/method_inline_declaration.cc b/tests/method_inline_declaration.cc
index 92210c5b..290c2fb6 100644
--- a/tests/method_inline_declaration.cc
+++ b/tests/method_inline_declaration.cc
@@ -20,7 +20,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@foo#",
       "short_name": "foo",
       "detailed_name": "void Foo::foo()",
-      "is_constructor": false,
       "definition_spelling": "2:8-2:11",
       "definition_extent": "2:3-2:16",
       "declaring_type": 0
diff --git a/tests/multi_file/impl.cc b/tests/multi_file/impl.cc
index ab2a930d..ac61efc8 100644
--- a/tests/multi_file/impl.cc
+++ b/tests/multi_file/impl.cc
@@ -58,7 +58,6 @@ OUTPUT: header.h
       "usr": "c:@FT@>1#TFoo1#v#",
       "short_name": "Foo1",
       "detailed_name": "void Foo1()",
-      "is_constructor": false,
       "definition_spelling": "10:6-10:10",
       "definition_extent": "10:1-10:15"
     }],
@@ -132,14 +131,12 @@ OUTPUT: impl.cc
       "usr": "c:@F@Impl#",
       "short_name": "Impl",
       "detailed_name": "void Impl()",
-      "is_constructor": false,
       "definition_spelling": "3:6-3:10",
       "definition_extent": "3:1-5:2",
       "callees": ["1@4:3-4:7"]
     }, {
       "id": 1,
       "usr": "c:@FT@>1#TFoo1#v#",
-      "is_constructor": false,
       "callers": ["0@4:3-4:7"]
     }]
 }
diff --git a/tests/multi_file/simple_impl.cc b/tests/multi_file/simple_impl.cc
index 05d3e25d..a9220aeb 100644
--- a/tests/multi_file/simple_impl.cc
+++ b/tests/multi_file/simple_impl.cc
@@ -13,7 +13,6 @@ OUTPUT: simple_header.h
       "usr": "c:@F@header#",
       "short_name": "header",
       "detailed_name": "void header()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "3:6-3:12",
           "extent": "3:1-3:14",
@@ -33,14 +32,12 @@ OUTPUT: simple_impl.cc
       "usr": "c:@F@impl#",
       "short_name": "impl",
       "detailed_name": "void impl()",
-      "is_constructor": false,
       "definition_spelling": "3:6-3:10",
       "definition_extent": "3:1-5:2",
       "callees": ["1@4:3-4:9"]
     }, {
       "id": 1,
       "usr": "c:@F@header#",
-      "is_constructor": false,
       "callers": ["0@4:3-4:9"]
     }]
 }
diff --git a/tests/multi_file/static.cc b/tests/multi_file/static.cc
index e9158c52..068c29a8 100644
--- a/tests/multi_file/static.cc
+++ b/tests/multi_file/static.cc
@@ -21,7 +21,6 @@ OUTPUT: static.h
       "usr": "c:@S@Buffer@F@CreateSharedBuffer#S",
       "short_name": "CreateSharedBuffer",
       "detailed_name": "void Buffer::CreateSharedBuffer()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "4:15-4:33",
           "extent": "4:3-4:35",
@@ -48,7 +47,6 @@ OUTPUT: static.cc
       "usr": "c:@S@Buffer@F@CreateSharedBuffer#S",
       "short_name": "CreateSharedBuffer",
       "detailed_name": "void Buffer::CreateSharedBuffer()",
-      "is_constructor": false,
       "definition_spelling": "3:14-3:32",
       "definition_extent": "3:1-3:37",
       "declaring_type": 0
diff --git a/tests/namespaces/anonymous_function.cc b/tests/namespaces/anonymous_function.cc
index 5ba8a540..9f11720f 100644
--- a/tests/namespaces/anonymous_function.cc
+++ b/tests/namespaces/anonymous_function.cc
@@ -10,7 +10,6 @@ OUTPUT:
       "usr": "c:anonymous_function.cc@aN@F@foo#",
       "short_name": "foo",
       "detailed_name": "void ::foo()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "2:6-2:9",
           "extent": "2:1-2:11",
diff --git a/tests/namespaces/function_declaration.cc b/tests/namespaces/function_declaration.cc
index 1bf282cd..90a5ce69 100644
--- a/tests/namespaces/function_declaration.cc
+++ b/tests/namespaces/function_declaration.cc
@@ -10,8 +10,6 @@ OUTPUT:
       "usr": "c:@N@hello@F@foo#I#I#",
       "short_name": "foo",
       "detailed_name": "void hello::foo(int, int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int", "int"],
       "declarations": [{
           "spelling": "2:6-2:9",
           "extent": "2:1-2:23",
diff --git a/tests/namespaces/function_definition.cc b/tests/namespaces/function_definition.cc
index 661a958f..fea89dbc 100644
--- a/tests/namespaces/function_definition.cc
+++ b/tests/namespaces/function_definition.cc
@@ -10,7 +10,6 @@ OUTPUT:
       "usr": "c:@N@hello@F@foo#",
       "short_name": "foo",
       "detailed_name": "void hello::foo()",
-      "is_constructor": false,
       "definition_spelling": "2:6-2:9",
       "definition_extent": "2:1-2:14"
     }]
diff --git a/tests/namespaces/method_declaration.cc b/tests/namespaces/method_declaration.cc
index 3b1fd2d0..2695780e 100644
--- a/tests/namespaces/method_declaration.cc
+++ b/tests/namespaces/method_declaration.cc
@@ -22,7 +22,6 @@ OUTPUT:
       "usr": "c:@N@hello@S@Foo@F@foo#",
       "short_name": "foo",
       "detailed_name": "void hello::Foo::foo()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "3:8-3:11",
           "extent": "3:3-3:13",
diff --git a/tests/namespaces/method_definition.cc b/tests/namespaces/method_definition.cc
index 0ed78390..0eae147a 100644
--- a/tests/namespaces/method_definition.cc
+++ b/tests/namespaces/method_definition.cc
@@ -24,7 +24,6 @@ OUTPUT:
       "usr": "c:@N@hello@S@Foo@F@foo#",
       "short_name": "foo",
       "detailed_name": "void hello::Foo::foo()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "3:8-3:11",
           "extent": "3:3-3:13",
diff --git a/tests/namespaces/method_inline_declaration.cc b/tests/namespaces/method_inline_declaration.cc
index 4d4f48ca..ab6e5c5b 100644
--- a/tests/namespaces/method_inline_declaration.cc
+++ b/tests/namespaces/method_inline_declaration.cc
@@ -22,7 +22,6 @@ OUTPUT:
       "usr": "c:@N@hello@S@Foo@F@foo#",
       "short_name": "foo",
       "detailed_name": "void hello::Foo::foo()",
-      "is_constructor": false,
       "definition_spelling": "3:8-3:11",
       "definition_extent": "3:3-3:16",
       "declaring_type": 0
diff --git a/tests/namespaces/namespace_alias.cc b/tests/namespaces/namespace_alias.cc
index 82b9ed7d..b1957afc 100644
--- a/tests/namespaces/namespace_alias.cc
+++ b/tests/namespaces/namespace_alias.cc
@@ -21,7 +21,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "11:6-11:9",
       "definition_extent": "11:1-14:2"
     }],
diff --git a/tests/namespaces/namespace_reference.cc b/tests/namespaces/namespace_reference.cc
index d7cddaed..41e7af2c 100644
--- a/tests/namespaces/namespace_reference.cc
+++ b/tests/namespaces/namespace_reference.cc
@@ -17,8 +17,6 @@ OUTPUT:
       "usr": "c:@N@ns@F@Accept#I#",
       "short_name": "Accept",
       "detailed_name": "void ns::Accept(int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int"],
       "definition_spelling": "3:8-3:14",
       "definition_extent": "3:3-3:24",
       "callers": ["1@7:7-7:13", "1@9:3-9:9"]
@@ -27,7 +25,6 @@ OUTPUT:
       "usr": "c:@F@Runner#",
       "short_name": "Runner",
       "detailed_name": "void Runner()",
-      "is_constructor": false,
       "definition_spelling": "6:6-6:12",
       "definition_extent": "6:1-10:2",
       "callees": ["0@7:7-7:13", "0@9:3-9:9"]
diff --git a/tests/outline/outline2.cc b/tests/outline/outline2.cc
index 4ee7bf33..04776b1d 100644
--- a/tests/outline/outline2.cc
+++ b/tests/outline/outline2.cc
@@ -47,8 +47,6 @@ OUTPUT:
       "usr": "c:@F@LoadCompilationEntriesFromDirectory#&1$@N@std@S@basic_string>#C#$@N@std@S@char_traits>#C#$@N@std@S@allocator>#C#",
       "short_name": "LoadCompilationEntriesFromDirectory",
       "detailed_name": "std::vector<CompilationEntry> LoadCompilationEntriesFromDirectory(const std::string &)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["const std::string &"],
       "declarations": [{
           "spelling": "12:31-12:66",
           "extent": "12:1-12:104",
diff --git a/tests/outline/static_function_in_type.cc b/tests/outline/static_function_in_type.cc
index ccdb1a34..6373988a 100644
--- a/tests/outline/static_function_in_type.cc
+++ b/tests/outline/static_function_in_type.cc
@@ -29,8 +29,6 @@ OUTPUT: static_function_in_type.h
       "usr": "c:@N@ns@S@Foo@F@Register#*$@N@ns@S@Manager#S",
       "short_name": "Register",
       "detailed_name": "void ns::Foo::Register(ns::Manager *)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["ns::Manager *"],
       "declarations": [{
           "spelling": "6:15-6:23",
           "extent": "6:3-6:33",
@@ -63,8 +61,6 @@ OUTPUT: static_function_in_type.cc
       "usr": "c:@N@ns@S@Foo@F@Register#*$@N@ns@S@Manager#S",
       "short_name": "Register",
       "detailed_name": "void ns::Foo::Register(ns::Manager *)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["ns::Manager *"],
       "definition_spelling": "5:11-5:19",
       "definition_extent": "5:1-6:2",
       "declaring_type": 0
diff --git a/tests/templates/func_specialized_template_param.cc b/tests/templates/func_specialized_template_param.cc
index 645befca..9e0d11c6 100644
--- a/tests/templates/func_specialized_template_param.cc
+++ b/tests/templates/func_specialized_template_param.cc
@@ -33,8 +33,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@Bar#&$@S@Template>#d#",
       "short_name": "Bar",
       "detailed_name": "void Foo::Bar(Template<double> &)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["Template<double> &"],
       "declarations": [{
           "spelling": "5:8-5:11",
           "extent": "5:3-5:30",
diff --git a/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc b/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc
index 92f20bf9..811949a1 100644
--- a/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc
+++ b/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc
@@ -29,7 +29,6 @@ OUTPUT:
       "usr": "c:@N@ns@ST>1#T@Foo@FT@>1#Tfoo#I#S",
       "short_name": "foo",
       "detailed_name": "int ns::Foo::foo()",
-      "is_constructor": false,
       "definition_spelling": "5:16-5:19",
       "definition_extent": "5:5-7:6",
       "declaring_type": 0,
diff --git a/tests/templates/specialized_func_definition.cc b/tests/templates/specialized_func_definition.cc
index f29c48ec..a57a2b40 100644
--- a/tests/templates/specialized_func_definition.cc
+++ b/tests/templates/specialized_func_definition.cc
@@ -30,7 +30,6 @@ OUTPUT:
       "usr": "c:@ST>1#T@Template@F@Foo#",
       "short_name": "Foo",
       "detailed_name": "void Template::Foo()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "3:8-3:11",
           "extent": "3:3-3:13",
diff --git a/tests/templates/template_class_func_usage_folded_into_one.cc b/tests/templates/template_class_func_usage_folded_into_one.cc
index 4d4c380a..7030c299 100644
--- a/tests/templates/template_class_func_usage_folded_into_one.cc
+++ b/tests/templates/template_class_func_usage_folded_into_one.cc
@@ -26,7 +26,6 @@ OUTPUT:
       "usr": "c:@ST>1#T@Foo@F@foo#S",
       "short_name": "foo",
       "detailed_name": "int Foo::foo()",
-      "is_constructor": false,
       "definition_spelling": "3:14-3:17",
       "definition_extent": "3:3-5:4",
       "declaring_type": 0,
diff --git a/tests/templates/template_class_template_func_usage_folded_into_one.cc b/tests/templates/template_class_template_func_usage_folded_into_one.cc
index 0637b2d0..a43d1544 100644
--- a/tests/templates/template_class_template_func_usage_folded_into_one.cc
+++ b/tests/templates/template_class_template_func_usage_folded_into_one.cc
@@ -27,7 +27,6 @@ OUTPUT:
       "usr": "c:@ST>1#T@Foo@FT@>1#Tfoo#I#S",
       "short_name": "foo",
       "detailed_name": "int Foo::foo()",
-      "is_constructor": false,
       "definition_spelling": "4:14-4:17",
       "definition_extent": "4:3-6:4",
       "declaring_type": 0,
diff --git a/tests/templates/template_func_usage_folded_into_one.cc b/tests/templates/template_func_usage_folded_into_one.cc
index e1653d66..10426ddb 100644
--- a/tests/templates/template_func_usage_folded_into_one.cc
+++ b/tests/templates/template_func_usage_folded_into_one.cc
@@ -17,7 +17,6 @@ OUTPUT:
       "usr": "c:template_func_usage_folded_into_one.cc@FT@>1#Tfoo#I#",
       "short_name": "foo",
       "detailed_name": "int foo()",
-      "is_constructor": false,
       "definition_spelling": "2:12-2:15",
       "definition_extent": "2:1-4:2",
       "callers": ["-1@6:9-6:12", "-1@7:9-7:12"]
diff --git a/tests/unions/union_usage.cc b/tests/unions/union_usage.cc
index 16268688..d1a95765 100644
--- a/tests/unions/union_usage.cc
+++ b/tests/unions/union_usage.cc
@@ -30,8 +30,6 @@ OUTPUT:
       "usr": "c:@F@act#*$@U@Foo#",
       "short_name": "act",
       "detailed_name": "void act(Foo *)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["Foo *"],
       "definition_spelling": "8:6-8:9",
       "definition_extent": "8:1-10:2"
     }],
diff --git a/tests/usage/func_called_from_constructor.cc b/tests/usage/func_called_from_constructor.cc
index 5cb8e254..2dc9ac29 100644
--- a/tests/usage/func_called_from_constructor.cc
+++ b/tests/usage/func_called_from_constructor.cc
@@ -26,7 +26,6 @@ OUTPUT:
       "usr": "c:@F@called#",
       "short_name": "called",
       "detailed_name": "void called()",
-      "is_constructor": false,
       "definition_spelling": "1:6-1:12",
       "definition_extent": "1:1-1:17",
       "callers": ["1@8:3-8:9"]
@@ -35,7 +34,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@Foo#",
       "short_name": "Foo",
       "detailed_name": "void Foo::Foo()",
-      "is_constructor": true,
       "declarations": [{
           "spelling": "4:3-4:6",
           "extent": "4:3-4:8",
diff --git a/tests/usage/func_called_from_macro_argument.cc b/tests/usage/func_called_from_macro_argument.cc
index f7f1e69c..99b839a1 100644
--- a/tests/usage/func_called_from_macro_argument.cc
+++ b/tests/usage/func_called_from_macro_argument.cc
@@ -14,8 +14,6 @@ OUTPUT:
       "usr": "c:@F@called#b#b#",
       "short_name": "called",
       "detailed_name": "bool called(bool, bool)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["bool", "bool"],
       "declarations": [{
           "spelling": "3:6-3:12",
           "extent": "3:1-3:28",
@@ -28,7 +26,6 @@ OUTPUT:
       "usr": "c:@F@caller#",
       "short_name": "caller",
       "detailed_name": "void caller()",
-      "is_constructor": false,
       "definition_spelling": "5:6-5:12",
       "definition_extent": "5:1-7:2",
       "callees": ["0@6:14-6:20"]
diff --git a/tests/usage/func_called_from_template.cc b/tests/usage/func_called_from_template.cc
index bf9caa49..3d859dbc 100644
--- a/tests/usage/func_called_from_template.cc
+++ b/tests/usage/func_called_from_template.cc
@@ -19,7 +19,6 @@ OUTPUT:
       "usr": "c:@F@called#",
       "short_name": "called",
       "detailed_name": "void called()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "1:6-1:12",
           "extent": "1:1-1:14",
@@ -31,7 +30,6 @@ OUTPUT:
       "usr": "c:@FT@>1#Tcaller#v#",
       "short_name": "caller",
       "detailed_name": "void caller()",
-      "is_constructor": false,
       "definition_spelling": "4:6-4:12",
       "definition_extent": "4:1-6:2",
       "callers": ["2@9:3-9:9"],
@@ -41,7 +39,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "8:6-8:9",
       "definition_extent": "8:1-10:2",
       "callees": ["1@9:3-9:9"]
diff --git a/tests/usage/func_called_implicit_ctor.cc b/tests/usage/func_called_implicit_ctor.cc
index 2c4e9063..9dd820cb 100644
--- a/tests/usage/func_called_implicit_ctor.cc
+++ b/tests/usage/func_called_implicit_ctor.cc
@@ -26,8 +26,6 @@ OUTPUT:
       "usr": "c:@S@Wrapper@F@Wrapper#I#",
       "short_name": "Wrapper",
       "detailed_name": "void Wrapper::Wrapper(int)",
-      "is_constructor": true,
-      "parameter_type_descriptions": ["int"],
       "declarations": [{
           "spelling": "2:3-2:10",
           "extent": "2:3-2:17",
@@ -41,7 +39,6 @@ OUTPUT:
       "usr": "c:@F@called#",
       "short_name": "called",
       "detailed_name": "int called()",
-      "is_constructor": false,
       "definition_spelling": "5:5-5:11",
       "definition_extent": "5:1-5:27",
       "callers": ["2@8:10-8:16"]
@@ -50,7 +47,6 @@ OUTPUT:
       "usr": "c:@F@caller#",
       "short_name": "caller",
       "detailed_name": "Wrapper caller()",
-      "is_constructor": false,
       "definition_spelling": "7:9-7:15",
       "definition_extent": "7:1-9:2",
       "callees": ["~0@8:10-8:16", "1@8:10-8:16"]
diff --git a/tests/usage/func_usage_addr_func.cc b/tests/usage/func_usage_addr_func.cc
index abbb49fd..e4c57986 100644
--- a/tests/usage/func_usage_addr_func.cc
+++ b/tests/usage/func_usage_addr_func.cc
@@ -15,8 +15,6 @@ OUTPUT:
       "usr": "c:@F@consume#*v#",
       "short_name": "consume",
       "detailed_name": "void consume(void *)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["void *"],
       "definition_spelling": "1:6-1:13",
       "definition_extent": "1:1-1:23",
       "callers": ["2@7:3-7:10"]
@@ -25,7 +23,6 @@ OUTPUT:
       "usr": "c:@F@used#",
       "short_name": "used",
       "detailed_name": "void used()",
-      "is_constructor": false,
       "definition_spelling": "3:6-3:10",
       "definition_extent": "3:1-3:15",
       "callers": ["2@6:13-6:17", "2@7:12-7:16"]
@@ -34,7 +31,6 @@ OUTPUT:
       "usr": "c:@F@user#",
       "short_name": "user",
       "detailed_name": "void user()",
-      "is_constructor": false,
       "definition_spelling": "5:6-5:10",
       "definition_extent": "5:1-8:2",
       "callees": ["1@6:13-6:17", "0@7:3-7:10", "1@7:12-7:16"]
diff --git a/tests/usage/func_usage_addr_method.cc b/tests/usage/func_usage_addr_method.cc
index 4c3b1f07..933b3597 100644
--- a/tests/usage/func_usage_addr_method.cc
+++ b/tests/usage/func_usage_addr_method.cc
@@ -25,7 +25,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@Used#",
       "short_name": "Used",
       "detailed_name": "void Foo::Used()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "2:8-2:12",
           "extent": "2:3-2:14",
@@ -38,7 +37,6 @@ OUTPUT:
       "usr": "c:@F@user#",
       "short_name": "user",
       "detailed_name": "void user()",
-      "is_constructor": false,
       "definition_spelling": "5:6-5:10",
       "definition_extent": "5:1-7:2",
       "callees": ["0@6:18-6:22"]
diff --git a/tests/usage/func_usage_call_func.cc b/tests/usage/func_usage_call_func.cc
index 8405b25c..ece26390 100644
--- a/tests/usage/func_usage_call_func.cc
+++ b/tests/usage/func_usage_call_func.cc
@@ -11,7 +11,6 @@ OUTPUT:
       "usr": "c:@F@called#",
       "short_name": "called",
       "detailed_name": "void called()",
-      "is_constructor": false,
       "definition_spelling": "1:6-1:12",
       "definition_extent": "1:1-1:17",
       "callers": ["1@3:3-3:9"]
@@ -20,7 +19,6 @@ OUTPUT:
       "usr": "c:@F@caller#",
       "short_name": "caller",
       "detailed_name": "void caller()",
-      "is_constructor": false,
       "definition_spelling": "2:6-2:12",
       "definition_extent": "2:1-4:2",
       "callees": ["0@3:3-3:9"]
diff --git a/tests/usage/func_usage_call_method.cc b/tests/usage/func_usage_call_method.cc
index a9b32860..7a8ec497 100644
--- a/tests/usage/func_usage_call_method.cc
+++ b/tests/usage/func_usage_call_method.cc
@@ -26,7 +26,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@Used#",
       "short_name": "Used",
       "detailed_name": "void Foo::Used()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "2:8-2:12",
           "extent": "2:3-2:14",
@@ -39,7 +38,6 @@ OUTPUT:
       "usr": "c:@F@user#",
       "short_name": "user",
       "detailed_name": "void user()",
-      "is_constructor": false,
       "definition_spelling": "5:6-5:10",
       "definition_extent": "5:1-8:2",
       "callees": ["0@7:6-7:10"]
diff --git a/tests/usage/func_usage_class_inline_var_def.cc b/tests/usage/func_usage_class_inline_var_def.cc
index dbb32cde..46b54419 100644
--- a/tests/usage/func_usage_class_inline_var_def.cc
+++ b/tests/usage/func_usage_class_inline_var_def.cc
@@ -24,7 +24,6 @@ OUTPUT:
       "usr": "c:func_usage_class_inline_var_def.cc@F@helper#",
       "short_name": "helper",
       "detailed_name": "int helper()",
-      "is_constructor": false,
       "definition_spelling": "1:12-1:18",
       "definition_extent": "1:1-3:2",
       "callers": ["-1@6:11-6:17"]
diff --git a/tests/usage/func_usage_forward_decl_func.cc b/tests/usage/func_usage_forward_decl_func.cc
index 6f2a561a..d9ab35e3 100644
--- a/tests/usage/func_usage_forward_decl_func.cc
+++ b/tests/usage/func_usage_forward_decl_func.cc
@@ -11,7 +11,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "1:6-1:9",
           "extent": "1:1-1:11",
@@ -23,7 +22,6 @@ OUTPUT:
       "usr": "c:@F@usage#",
       "short_name": "usage",
       "detailed_name": "void usage()",
-      "is_constructor": false,
       "definition_spelling": "3:6-3:11",
       "definition_extent": "3:1-5:2",
       "callees": ["0@4:3-4:6"]
diff --git a/tests/usage/func_usage_forward_decl_method.cc b/tests/usage/func_usage_forward_decl_method.cc
index d5858a7b..15f81a82 100644
--- a/tests/usage/func_usage_forward_decl_method.cc
+++ b/tests/usage/func_usage_forward_decl_method.cc
@@ -25,7 +25,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@foo#",
       "short_name": "foo",
       "detailed_name": "void Foo::foo()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "2:8-2:11",
           "extent": "2:3-2:13",
@@ -38,7 +37,6 @@ OUTPUT:
       "usr": "c:@F@usage#",
       "short_name": "usage",
       "detailed_name": "void usage()",
-      "is_constructor": false,
       "definition_spelling": "5:6-5:11",
       "definition_extent": "5:1-8:2",
       "callees": ["0@7:6-7:9"]
diff --git a/tests/usage/func_usage_template_func.cc b/tests/usage/func_usage_template_func.cc
index 39c8cffd..8efd8ee0 100644
--- a/tests/usage/func_usage_template_func.cc
+++ b/tests/usage/func_usage_template_func.cc
@@ -14,8 +14,6 @@ OUTPUT:
       "usr": "c:@FT@>1#Taccept#t0.0#v#",
       "short_name": "accept",
       "detailed_name": "void accept(T)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["T"],
       "declarations": [{
           "spelling": "2:6-2:12",
           "extent": "2:1-2:15",
@@ -28,7 +26,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "4:6-4:9",
       "definition_extent": "4:1-7:2",
       "callees": ["0@5:3-5:9", "0@6:3-6:9"]
diff --git a/tests/usage/type_usage_as_template_parameter.cc b/tests/usage/type_usage_as_template_parameter.cc
index f0afaaa5..b770f933 100644
--- a/tests/usage/type_usage_as_template_parameter.cc
+++ b/tests/usage/type_usage_as_template_parameter.cc
@@ -32,7 +32,6 @@ OUTPUT:
       "usr": "c:@F@return_type#",
       "short_name": "return_type",
       "detailed_name": "unique_ptr<S> *return_type()",
-      "is_constructor": false,
       "definition_spelling": "9:16-9:27",
       "definition_extent": "9:1-12:2"
     }],
diff --git a/tests/usage/type_usage_as_template_parameter_complex.cc b/tests/usage/type_usage_as_template_parameter_complex.cc
index 3bc77bca..d6b282db 100644
--- a/tests/usage/type_usage_as_template_parameter_complex.cc
+++ b/tests/usage/type_usage_as_template_parameter_complex.cc
@@ -110,8 +110,6 @@ OUTPUT:
       "usr": "c:@F@as_return_type#*$@S@unique_ptr>#$@S@S1#$@S@S2#",
       "short_name": "as_return_type",
       "detailed_name": "unique_ptr<unique_ptr<S1, S2>, S2> *as_return_type(unique_ptr<S1, S2> *)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["unique_ptr<S1, S2> *"],
       "definition_spelling": "33:37-33:51",
       "definition_extent": "33:1-33:92"
     }, {
@@ -119,8 +117,6 @@ OUTPUT:
       "usr": "c:@F@no_return_type#I#",
       "short_name": "no_return_type",
       "detailed_name": "void no_return_type(int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int"],
       "definition_spelling": "40:6-40:20",
       "definition_extent": "40:1-40:28"
     }, {
@@ -128,7 +124,6 @@ OUTPUT:
       "usr": "c:@F@empty#",
       "short_name": "empty",
       "detailed_name": "void empty()",
-      "is_constructor": false,
       "definition_spelling": "53:6-53:11",
       "definition_extent": "53:1-55:2"
     }, {
@@ -136,7 +131,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@foo#",
       "short_name": "foo",
       "detailed_name": "unique_ptr<S1, S2> *Foo::foo()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "65:23-65:26",
           "extent": "65:3-65:28",
diff --git a/tests/usage/type_usage_declare_local.cc b/tests/usage/type_usage_declare_local.cc
index 71e9a5bb..1d238623 100644
--- a/tests/usage/type_usage_declare_local.cc
+++ b/tests/usage/type_usage_declare_local.cc
@@ -29,7 +29,6 @@ OUTPUT:
       "usr": "c:@F@Foo#",
       "short_name": "Foo",
       "detailed_name": "void Foo()",
-      "is_constructor": false,
       "definition_spelling": "4:6-4:9",
       "definition_extent": "4:1-7:2"
     }],
diff --git a/tests/usage/type_usage_declare_param.cc b/tests/usage/type_usage_declare_param.cc
index 54f1b658..9ad96cb5 100644
--- a/tests/usage/type_usage_declare_param.cc
+++ b/tests/usage/type_usage_declare_param.cc
@@ -26,8 +26,6 @@ OUTPUT:
       "usr": "c:@F@foo#*$@S@ForwardType#$@S@ImplementedType#",
       "short_name": "foo",
       "detailed_name": "void foo(ForwardType *, ImplementedType)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["ForwardType *", "ImplementedType"],
       "definition_spelling": "4:6-4:9",
       "definition_extent": "4:1-4:47"
     }],
diff --git a/tests/usage/type_usage_declare_param_prototype.cc b/tests/usage/type_usage_declare_param_prototype.cc
index db77490f..4370d2d0 100644
--- a/tests/usage/type_usage_declare_param_prototype.cc
+++ b/tests/usage/type_usage_declare_param_prototype.cc
@@ -22,8 +22,6 @@ OUTPUT:
       "usr": "c:@F@foo#*$@S@Foo#S0_#",
       "short_name": "foo",
       "detailed_name": "void foo(Foo *, Foo *)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["Foo *", "Foo *"],
       "declarations": [{
           "spelling": "3:6-3:9",
           "extent": "3:1-3:23",
diff --git a/tests/usage/type_usage_declare_param_unnamed.cc b/tests/usage/type_usage_declare_param_unnamed.cc
index 6e6f7760..26a4cd6c 100644
--- a/tests/usage/type_usage_declare_param_unnamed.cc
+++ b/tests/usage/type_usage_declare_param_unnamed.cc
@@ -13,8 +13,6 @@ OUTPUT:
       "usr": "c:@F@foo#*$@S@ForwardType#",
       "short_name": "foo",
       "detailed_name": "void foo(ForwardType *)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["ForwardType *"],
       "definition_spelling": "2:6-2:9",
       "definition_extent": "2:1-2:26"
     }]
diff --git a/tests/usage/type_usage_declare_qualifiers.cc b/tests/usage/type_usage_declare_qualifiers.cc
index b1da3b65..9671c90b 100644
--- a/tests/usage/type_usage_declare_qualifiers.cc
+++ b/tests/usage/type_usage_declare_qualifiers.cc
@@ -24,8 +24,6 @@ OUTPUT:
       "usr": "c:@F@foo#&$@S@Type#&1S1_#",
       "short_name": "foo",
       "detailed_name": "void foo(Type &, const Type &)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["Type &", "const Type &"],
       "definition_spelling": "3:6-3:9",
       "definition_extent": "3:1-8:2"
     }],
diff --git a/tests/usage/type_usage_on_return_type.cc b/tests/usage/type_usage_on_return_type.cc
index 1c3fde8b..0014b963 100644
--- a/tests/usage/type_usage_on_return_type.cc
+++ b/tests/usage/type_usage_on_return_type.cc
@@ -39,7 +39,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "Type *foo()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "3:7-3:10",
           "extent": "3:1-3:12",
@@ -56,8 +55,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@Get#I#",
       "short_name": "Get",
       "detailed_name": "Type *Foo::Get(int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int"],
       "declarations": [{
           "spelling": "8:9-8:12",
           "extent": "8:3-8:17",
@@ -72,7 +69,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@Empty#",
       "short_name": "Empty",
       "detailed_name": "void Foo::Empty()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "9:8-9:13",
           "extent": "9:3-9:15",
@@ -86,7 +82,6 @@ OUTPUT:
       "usr": "c:@F@external#",
       "short_name": "external",
       "detailed_name": "const Type &external()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "15:20-15:28",
           "extent": "15:1-15:30",
@@ -97,7 +92,6 @@ OUTPUT:
       "usr": "c:type_usage_on_return_type.cc@F@bar#",
       "short_name": "bar",
       "detailed_name": "Type *bar()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "17:14-17:17",
           "extent": "17:1-17:19",
diff --git a/tests/usage/type_usage_typedef_and_using.cc b/tests/usage/type_usage_typedef_and_using.cc
index 3dbb4b38..3974157f 100644
--- a/tests/usage/type_usage_typedef_and_using.cc
+++ b/tests/usage/type_usage_typedef_and_using.cc
@@ -57,8 +57,6 @@ OUTPUT:
       "usr": "c:@F@accept#*$@S@Foo#",
       "short_name": "accept",
       "detailed_name": "void accept(Foo *)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["Foo *"],
       "definition_spelling": "7:6-7:12",
       "definition_extent": "7:1-7:21"
     }, {
@@ -66,8 +64,6 @@ OUTPUT:
       "usr": "c:@F@accept1#**$@S@Foo#",
       "short_name": "accept1",
       "detailed_name": "void accept1(Foo1 *)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["Foo1 *"],
       "definition_spelling": "8:6-8:13",
       "definition_extent": "8:1-8:23"
     }, {
@@ -75,8 +71,6 @@ OUTPUT:
       "usr": "c:@F@accept2#*$@S@Foo#",
       "short_name": "accept2",
       "detailed_name": "void accept2(Foo2 *)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["Foo2 *"],
       "definition_spelling": "9:6-9:13",
       "definition_extent": "9:1-9:23"
     }, {
@@ -84,8 +78,6 @@ OUTPUT:
       "usr": "c:@F@accept3#**$@S@Foo#",
       "short_name": "accept3",
       "detailed_name": "void accept3(Foo3 *)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["Foo3 *"],
       "definition_spelling": "10:6-10:13",
       "definition_extent": "10:1-10:23"
     }]
diff --git a/tests/usage/type_usage_various.cc b/tests/usage/type_usage_various.cc
index 3d9ac837..36cdfeb2 100644
--- a/tests/usage/type_usage_various.cc
+++ b/tests/usage/type_usage_various.cc
@@ -28,7 +28,6 @@ OUTPUT:
       "usr": "c:@S@Foo@F@make#",
       "short_name": "make",
       "detailed_name": "Foo *Foo::make()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "2:8-2:12",
           "extent": "2:3-2:14",
diff --git a/tests/usage/usage_inside_of_call.cc b/tests/usage/usage_inside_of_call.cc
index 12b13857..d4d5edd7 100644
--- a/tests/usage/usage_inside_of_call.cc
+++ b/tests/usage/usage_inside_of_call.cc
@@ -32,8 +32,6 @@ OUTPUT:
       "usr": "c:@F@called#I#",
       "short_name": "called",
       "detailed_name": "void called(int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int"],
       "declarations": [{
           "spelling": "1:6-1:12",
           "extent": "1:1-1:19",
@@ -46,7 +44,6 @@ OUTPUT:
       "usr": "c:@F@gen#",
       "short_name": "gen",
       "detailed_name": "int gen()",
-      "is_constructor": false,
       "declarations": [{
           "spelling": "3:5-3:8",
           "extent": "3:1-3:10",
@@ -58,7 +55,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "12:6-12:9",
       "definition_extent": "12:1-15:2",
       "callees": ["0@14:3-14:9", "1@14:14-14:17"]
diff --git a/tests/usage/usage_inside_of_call_simple.cc b/tests/usage/usage_inside_of_call_simple.cc
index fc843650..22712e22 100644
--- a/tests/usage/usage_inside_of_call_simple.cc
+++ b/tests/usage/usage_inside_of_call_simple.cc
@@ -14,8 +14,6 @@ OUTPUT:
       "usr": "c:@F@called#I#",
       "short_name": "called",
       "detailed_name": "void called(int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int"],
       "declarations": [{
           "spelling": "1:6-1:12",
           "extent": "1:1-1:19",
@@ -28,7 +26,6 @@ OUTPUT:
       "usr": "c:@F@gen#",
       "short_name": "gen",
       "detailed_name": "int gen()",
-      "is_constructor": false,
       "definition_spelling": "3:5-3:8",
       "definition_extent": "3:1-3:24",
       "callers": ["2@6:10-6:13", "2@6:18-6:21"]
@@ -37,7 +34,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "5:6-5:9",
       "definition_extent": "5:1-7:2",
       "callees": ["0@6:3-6:9", "1@6:10-6:13", "1@6:18-6:21"]
diff --git a/tests/usage/var_usage_call_function.cc b/tests/usage/var_usage_call_function.cc
index dac6bb05..c5334e15 100644
--- a/tests/usage/var_usage_call_function.cc
+++ b/tests/usage/var_usage_call_function.cc
@@ -15,7 +15,6 @@ OUTPUT:
       "usr": "c:@F@called#",
       "short_name": "called",
       "detailed_name": "void called()",
-      "is_constructor": false,
       "definition_spelling": "1:6-1:12",
       "definition_extent": "1:1-1:17",
       "callers": ["1@4:13-4:19", "1@7:3-7:9"]
@@ -24,7 +23,6 @@ OUTPUT:
       "usr": "c:@F@caller#",
       "short_name": "caller",
       "detailed_name": "void caller()",
-      "is_constructor": false,
       "definition_spelling": "3:6-3:12",
       "definition_extent": "3:1-8:2",
       "callees": ["0@4:13-4:19", "0@7:3-7:9"]
diff --git a/tests/usage/var_usage_class_member.cc b/tests/usage/var_usage_class_member.cc
index 9324615d..71215b46 100644
--- a/tests/usage/var_usage_class_member.cc
+++ b/tests/usage/var_usage_class_member.cc
@@ -36,8 +36,6 @@ OUTPUT:
       "usr": "c:@F@accept#I#",
       "short_name": "accept",
       "detailed_name": "void accept(int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int"],
       "declarations": [{
           "spelling": "7:6-7:12",
           "extent": "7:1-7:17",
@@ -50,8 +48,6 @@ OUTPUT:
       "usr": "c:@F@accept#*I#",
       "short_name": "accept",
       "detailed_name": "void accept(int *)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int *"],
       "declarations": [{
           "spelling": "8:6-8:12",
           "extent": "8:1-8:18",
@@ -64,7 +60,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "10:6-10:9",
       "definition_extent": "10:1-18:2",
       "callees": ["0@14:3-14:9", "0@15:3-15:9", "1@16:3-16:9", "0@17:3-17:9"]
diff --git a/tests/usage/var_usage_class_member_static.cc b/tests/usage/var_usage_class_member_static.cc
index 02deaa50..c534d2f2 100644
--- a/tests/usage/var_usage_class_member_static.cc
+++ b/tests/usage/var_usage_class_member_static.cc
@@ -25,8 +25,6 @@ OUTPUT:
       "usr": "c:@F@accept#I#",
       "short_name": "accept",
       "detailed_name": "void accept(int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int"],
       "declarations": [{
           "spelling": "5:6-5:12",
           "extent": "5:1-5:17",
@@ -39,7 +37,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "7:6-7:9",
       "definition_extent": "7:1-9:2",
       "callees": ["0@8:3-8:9"]
diff --git a/tests/usage/var_usage_extern.cc b/tests/usage/var_usage_extern.cc
index 82d7f2fb..d2cb9865 100644
--- a/tests/usage/var_usage_extern.cc
+++ b/tests/usage/var_usage_extern.cc
@@ -11,7 +11,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "3:6-3:9",
       "definition_extent": "3:1-5:2"
     }],
diff --git a/tests/usage/var_usage_func_parameter.cc b/tests/usage/var_usage_func_parameter.cc
index f7cff35a..f10fa988 100644
--- a/tests/usage/var_usage_func_parameter.cc
+++ b/tests/usage/var_usage_func_parameter.cc
@@ -9,8 +9,6 @@ OUTPUT:
       "usr": "c:@F@foo#I#",
       "short_name": "foo",
       "detailed_name": "void foo(int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int"],
       "definition_spelling": "1:6-1:9",
       "definition_extent": "1:1-3:2"
     }],
diff --git a/tests/usage/var_usage_local.cc b/tests/usage/var_usage_local.cc
index d9051fda..e403c2a0 100644
--- a/tests/usage/var_usage_local.cc
+++ b/tests/usage/var_usage_local.cc
@@ -10,7 +10,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "1:6-1:9",
       "definition_extent": "1:1-4:2"
     }],
diff --git a/tests/usage/var_usage_shadowed_local.cc b/tests/usage/var_usage_shadowed_local.cc
index 1efa5379..8cfe84af 100644
--- a/tests/usage/var_usage_shadowed_local.cc
+++ b/tests/usage/var_usage_shadowed_local.cc
@@ -15,7 +15,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "1:6-1:9",
       "definition_extent": "1:1-9:2"
     }],
diff --git a/tests/usage/var_usage_shadowed_parameter.cc b/tests/usage/var_usage_shadowed_parameter.cc
index 34672854..1febb11a 100644
--- a/tests/usage/var_usage_shadowed_parameter.cc
+++ b/tests/usage/var_usage_shadowed_parameter.cc
@@ -15,8 +15,6 @@ OUTPUT:
       "usr": "c:@F@foo#I#",
       "short_name": "foo",
       "detailed_name": "void foo(int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int"],
       "definition_spelling": "1:6-1:9",
       "definition_extent": "1:1-8:2"
     }],
diff --git a/tests/usage/var_usage_static.cc b/tests/usage/var_usage_static.cc
index d95ee0a6..cef9e9d4 100644
--- a/tests/usage/var_usage_static.cc
+++ b/tests/usage/var_usage_static.cc
@@ -12,7 +12,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "3:6-3:9",
       "definition_extent": "3:1-5:2"
     }],
diff --git a/tests/vars/deduce_auto_type.cc b/tests/vars/deduce_auto_type.cc
index 5317fd92..8434a21b 100644
--- a/tests/vars/deduce_auto_type.cc
+++ b/tests/vars/deduce_auto_type.cc
@@ -22,7 +22,6 @@ OUTPUT:
       "usr": "c:@F@f#",
       "short_name": "f",
       "detailed_name": "void f()",
-      "is_constructor": false,
       "definition_spelling": "2:6-2:7",
       "definition_extent": "2:1-5:2"
     }],
diff --git a/tests/vars/function_local.cc b/tests/vars/function_local.cc
index 32d652d5..618ced76 100644
--- a/tests/vars/function_local.cc
+++ b/tests/vars/function_local.cc
@@ -18,7 +18,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "3:6-3:9",
       "definition_extent": "3:1-5:2"
     }],
diff --git a/tests/vars/function_param.cc b/tests/vars/function_param.cc
index b94e9068..5729336f 100644
--- a/tests/vars/function_param.cc
+++ b/tests/vars/function_param.cc
@@ -16,8 +16,6 @@ OUTPUT:
       "usr": "c:@F@foo#*$@S@Foo#S0_#",
       "short_name": "foo",
       "detailed_name": "void foo(Foo *, Foo *)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["Foo *", "Foo *"],
       "definition_spelling": "3:6-3:9",
       "definition_extent": "3:1-3:30"
     }],
diff --git a/tests/vars/function_param_unnamed.cc b/tests/vars/function_param_unnamed.cc
index cf7da7d6..228e2617 100644
--- a/tests/vars/function_param_unnamed.cc
+++ b/tests/vars/function_param_unnamed.cc
@@ -7,8 +7,6 @@ OUTPUT:
       "usr": "c:@F@foo#I#I#",
       "short_name": "foo",
       "detailed_name": "void foo(int, int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int", "int"],
       "definition_spelling": "1:6-1:9",
       "definition_extent": "1:1-1:22"
     }]
diff --git a/tests/vars/function_shadow_local.cc b/tests/vars/function_shadow_local.cc
index 26b2d2ba..e5a0675e 100644
--- a/tests/vars/function_shadow_local.cc
+++ b/tests/vars/function_shadow_local.cc
@@ -15,7 +15,6 @@ OUTPUT:
       "usr": "c:@F@foo#",
       "short_name": "foo",
       "detailed_name": "void foo()",
-      "is_constructor": false,
       "definition_spelling": "1:6-1:9",
       "definition_extent": "1:1-9:2"
     }],
diff --git a/tests/vars/function_shadow_param.cc b/tests/vars/function_shadow_param.cc
index bc936fdc..3b085120 100644
--- a/tests/vars/function_shadow_param.cc
+++ b/tests/vars/function_shadow_param.cc
@@ -9,8 +9,6 @@ OUTPUT:
       "usr": "c:@F@foo#I#",
       "short_name": "foo",
       "detailed_name": "void foo(int)",
-      "is_constructor": false,
-      "parameter_type_descriptions": ["int"],
       "definition_spelling": "1:6-1:9",
       "definition_extent": "1:1-3:2"
     }],
diff --git a/tests/vars/type_instance_on_using_type.cc b/tests/vars/type_instance_on_using_type.cc
index 2a591395..fbf6897d 100644
--- a/tests/vars/type_instance_on_using_type.cc
+++ b/tests/vars/type_instance_on_using_type.cc
@@ -33,7 +33,6 @@ OUTPUT:
       "usr": "c:@F@Foo#",
       "short_name": "Foo",
       "detailed_name": "void Foo()",
-      "is_constructor": false,
       "definition_spelling": "3:6-3:9",
       "definition_extent": "3:1-5:2"
     }],