diff --git a/canonical-decomposition.c b/home/dhsung/Projects/libunistring/lib/uninorm/canonical-decomposition.c
index b560df9..e82a9c2 100644
--- a/canonical-decomposition.c
+++ b/home/dhsung/Projects/libunistring/lib/uninorm/canonical-decomposition.c
@@ -1,7 +1,7 @@
 /* Canonical decomposition of Unicode characters.
    Copyright (C) 2009-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2009.
-
+   Modified by DaeHyun Sung <address@hidden>, 2017.
    This program is free software: you can redistribute it and/or
    modify it under the terms of either:
 
@@ -39,9 +39,7 @@ uc_canonical_decomposition (ucs4_t uc, ucs4_t *decomposition)
   if (uc >= 0xAC00 && uc < 0xD7A4)
     {
       /* Hangul syllable.  See Unicode standard, chapter 3, section
-         "Hangul Syllable Decomposition",  See also the clarification at
-         <http://www.unicode.org/versions/Unicode5.1.0/>, section
-         "Clarification of Hangul Jamo Handling".  */
+         "Hangul Syllable Decomposition"  */
       unsigned int t;
 
       uc -= 0xAC00;
@@ -61,11 +59,6 @@ uc_canonical_decomposition (ucs4_t uc, ucs4_t *decomposition)
         }
       else
         {
-#if 1 /* Return the pairwise decomposition, not the full decomposition.  */
-          decomposition[0] = 0xAC00 + uc - t; /* = 0xAC00 + (l * 21 + v) * 28; */
-          decomposition[1] = 0x11A7 + t;
-          return 2;
-#else
           unsigned int v, l;
 
           uc = uc / 28;
@@ -76,7 +69,6 @@ uc_canonical_decomposition (ucs4_t uc, ucs4_t *decomposition)
           decomposition[1] = 0x1161 + v;
           decomposition[2] = 0x11A7 + t;
           return 3;
-#endif
         }
     }
   else if (uc < 0x110000)