diff --git a/src/encoding/tlv-nfd.hpp b/src/encoding/tlv-nfd.hpp
index f7af459..5662470 100644
--- a/src/encoding/tlv-nfd.hpp
+++ b/src/encoding/tlv-nfd.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -35,7 +35,6 @@
   ControlParameters   = 104,
   FaceId              = 105,
   Uri                 = 114,
-  LocalControlFeature = 110,
   Origin              = 111,
   Cost                = 106,
   Flags               = 108,
diff --git a/src/encoding/tlv-security.hpp b/src/encoding/tlv-security.hpp
index ac8f248..7625d0b 100644
--- a/src/encoding/tlv-security.hpp
+++ b/src/encoding/tlv-security.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -29,12 +29,6 @@
 namespace security {
 
 enum {
-  IdentityPackage    = 128,
-  KeyPackage         = 129,
-  CertificatePackage = 130
-};
-
-enum {
   SafeBag = 128,
   EncryptedKeyBag = 129
 };
diff --git a/src/encoding/tlv.hpp b/src/encoding/tlv.hpp
index 52115f9..57ee509 100644
--- a/src/encoding/tlv.hpp
+++ b/src/encoding/tlv.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2013-2017 Regents of the University of California.
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -68,7 +68,6 @@
   NameComponent = 8,
   Selectors     = 9,
   Nonce         = 10,
-  // <Unassigned> = 11,
   InterestLifetime          = 12,
   ForwardingHint            = 30,
   MinSuffixComponents       = 13,
@@ -90,7 +89,6 @@
   KeyDigest       = 29,
   LinkPreference  = 30,
   LinkDelegation  = 31,
-  SelectedDelegation = 32,
 
   AppPrivateBlock1 = 128,
   AppPrivateBlock2 = 32767