diff --git a/src/gui/character_pad/character_palette.cc b/src/gui/character_pad/character_palette.cc
index d7a4008..6695f30 100644
--- a/src/gui/character_pad/character_palette.cc
+++ b/src/gui/character_pad/character_palette.cc
@@ -58,7 +58,6 @@
 const char kJISX0201Name[] = "JISX 0201";
 const char kJISX0208Name[] = "JISX 0208";
 const char kJISX0212Name[] = "JISX 0212";
-const char kJISX0213Name[] = "JISX 0213";
 
 const CharacterPalette::UnicodeRange kUCS2Range = { 0, 0xffff };
 
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index d07ab2a..457d0c4 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=16
-BUILD=2021
+BUILD=2022
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.
diff --git a/src/unix/ibus/mozc_engine.cc b/src/unix/ibus/mozc_engine.cc
index 250c9d3..3239f3a 100644
--- a/src/unix/ibus/mozc_engine.cc
+++ b/src/unix/ibus/mozc_engine.cc
@@ -75,12 +75,8 @@
 
 namespace {
 
-// A key which associates an IBusProperty object with MozcEngineProperty.
-const char kGObjectDataKey[] = "ibus-mozc-aux-data";
-// An ID for a candidate which is not associated with a text.
+// The ID for candidates which are not associated with texts.
 const int32 kBadCandidateId = -1;
-// The ibus-memconf section name in which we're interested.
-const char kMozcSectionName[] = "engine/Mozc";
 
 #ifdef ENABLE_GTK_RENDERER
 const char kMozcPanelSectionName[] = "panel";