diff --git a/classes/cache/CacheHandler.class.php b/classes/cache/CacheHandler.class.php
index 812561898..08d972504 100644
--- a/classes/cache/CacheHandler.class.php
+++ b/classes/cache/CacheHandler.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * CacheHandler
@@ -158,6 +157,3 @@ class CacheHandler extends Handler
 		return Rhymix\Framework\Cache::clearGroup($keyGroupName);
 	}
 }
-
-/* End of file CacheHandler.class.php */
-/* Location: ./classes/cache/CacheHandler.class.php */
diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 828577f8c..16f3c052f 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * Manages Context such as request arguments/environment variables
@@ -2869,5 +2868,3 @@ class Context
 		return self::$_instance->canonical_url;
 	}
 }
-/* End of file Context.class.php */
-/* Location: ./classes/context/Context.class.php */
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 45a6c8097..a5c8dbc51 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -1,13 +1,9 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
- * @class DisplayHandler
+ * DisplayHandler
+ *
  * @author NAVER (developers@xpressengine.com)
- *  DisplayHandler is responsible for displaying the execution result. \n
- *  Depending on the request type, it can display either HTML or XML content.\n
- *  Xml content is simple xml presentation of variables in oModule while html content
- *   is the combination of the variables of oModue and template files/.
  */
 class DisplayHandler extends Handler
 {
@@ -347,5 +343,3 @@ class DisplayHandler extends Handler
 	}
 
 }
-/* End of file DisplayHandler.class.php */
-/* Location: ./classes/display/DisplayHandler.class.php */
diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index 2807dacf7..970928c46 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class HTMLDisplayHandler
 {
@@ -734,5 +733,3 @@ class HTMLDisplayHandler
 		}
 	}
 }
-/* End of file HTMLDisplayHandler.class.php */
-/* Location: ./classes/display/HTMLDisplayHandler.class.php */
diff --git a/classes/display/JSCallbackDisplayHandler.php b/classes/display/JSCallbackDisplayHandler.php
index 2926a5066..13cd92c23 100644
--- a/classes/display/JSCallbackDisplayHandler.php
+++ b/classes/display/JSCallbackDisplayHandler.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class JSCallbackDisplayHandler
 {
@@ -21,5 +20,3 @@ class JSCallbackDisplayHandler
 </script>', Context::getJSCallbackFunc(), json_encode($variables));
 	}
 }
-/* End of file JSCallback.class.php */
-/* Location: ./classes/display/JSCallback.class.php */
diff --git a/classes/display/JSONDisplayHandler.php b/classes/display/JSONDisplayHandler.php
index 37aa6ba63..dc77d3f24 100644
--- a/classes/display/JSONDisplayHandler.php
+++ b/classes/display/JSONDisplayHandler.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class JSONDisplayHandler
 {
@@ -74,5 +73,3 @@ class JSONDisplayHandler
 		return true;
 	}
 }
-/* End of file JSONDisplayHandler.class.php */
-/* Location: ./classes/display/JSONDisplayHandler.class.php */
diff --git a/classes/display/VirtualXMLDisplayHandler.php b/classes/display/VirtualXMLDisplayHandler.php
index 62653ba4a..bd71ec674 100644
--- a/classes/display/VirtualXMLDisplayHandler.php
+++ b/classes/display/VirtualXMLDisplayHandler.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class VirtualXMLDisplayHandler
 {
@@ -65,5 +64,3 @@ class VirtualXMLDisplayHandler
 	}
 
 }
-/* End of file VirtualXMLDisplayHandler.class.php */
-/* Location: ./classes/display/VirtualXMLDisplayHandler.class.php */
diff --git a/classes/display/XMLDisplayHandler.php b/classes/display/XMLDisplayHandler.php
index 66890ef0f..27b753038 100644
--- a/classes/display/XMLDisplayHandler.php
+++ b/classes/display/XMLDisplayHandler.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class XMLDisplayHandler
 {
@@ -63,5 +62,3 @@ class XMLDisplayHandler
 	}
 
 }
-/* End of file XMLDisplayHandler.class.php */
-/* Location: ./classes/display/XMLDisplayHandler.class.php */
diff --git a/classes/editor/EditorHandler.class.php b/classes/editor/EditorHandler.class.php
index 88810cf0f..25f5f0b11 100644
--- a/classes/editor/EditorHandler.class.php
+++ b/classes/editor/EditorHandler.class.php
@@ -1,9 +1,7 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
- * Superclass of the edit component.
- * Set up the component variables
+ * Superclass of the editor component.
  *
  * @class EditorHandler
  * @author NAVER (developers@xpressengine.com)
@@ -32,5 +30,3 @@ class EditorHandler extends BaseObject
 	}
 
 }
-/* End of file EditorHandler.class.php */
-/* Location: ./classes/editor/EditorHandler.class.php */
diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index 705bdb753..0c37dbe1e 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * A class to handle extra variables used in posts, member and others
@@ -605,5 +604,3 @@ class ExtraItem
 	}
 
 }
-/* End of file ExtraVar.class.php */
-/* Location: ./classes/extravar/ExtraVar.class.php */
diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php
index f48797f7e..8fe93738b 100644
--- a/classes/file/FileHandler.class.php
+++ b/classes/file/FileHandler.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * Contains methods for accessing file system
@@ -932,6 +931,3 @@ class FileHandler
 		}
 	}
 }
-
-/* End of file FileHandler.class.php */
-/* Location: ./classes/file/FileHandler.class.php */
diff --git a/classes/file/FileObject.class.php b/classes/file/FileObject.class.php
index 2cc5e25da..002dedaba 100644
--- a/classes/file/FileObject.class.php
+++ b/classes/file/FileObject.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * File abstraction class
@@ -158,5 +157,3 @@ class FileObject extends BaseObject
 	}
 
 }
-/* End of file FileObject.class.php */
-/* Location: ./classes/file/FileObject.class.php */
diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php
index 52ca630a5..2e40e4035 100644
--- a/classes/frontendfile/FrontEndFileHandler.class.php
+++ b/classes/frontendfile/FrontEndFileHandler.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * Handle front end files
@@ -770,5 +769,3 @@ class FrontEndFileHandler extends Handler
 		}
 	}
 }
-/* End of file FrontEndFileHandler.class.php */
-/* Location: ./classes/frontendfile/FrontEndFileHandler.class.php */
diff --git a/classes/handler/Handler.class.php b/classes/handler/Handler.class.php
index bf4bcaa9b..98d140b76 100644
--- a/classes/handler/Handler.class.php
+++ b/classes/handler/Handler.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * An abstract class of (*)Handler
@@ -10,5 +9,3 @@ class Handler
 {
 
 }
-/* End of file Handler.class.php */
-/* Location: ./classes/handler/Handler.class.php */
diff --git a/classes/httprequest/XEHttpRequest.class.php b/classes/httprequest/XEHttpRequest.class.php
index 79f5d9746..cecc997ff 100644
--- a/classes/httprequest/XEHttpRequest.class.php
+++ b/classes/httprequest/XEHttpRequest.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * - HttpRequest class
@@ -255,5 +254,3 @@ class XEHttpRequest
 	}
 
 }
-/* End of file XEHttpRequest.class.php */
-/* Location: ./classes/httprequest/XEHttpRequest.class.php */
diff --git a/classes/mail/Mail.class.php b/classes/mail/Mail.class.php
index 0a65edd55..75afc3752 100644
--- a/classes/mail/Mail.class.php
+++ b/classes/mail/Mail.class.php
@@ -2,8 +2,6 @@
 
 /**
  * Mail class for XE Compatibility
- *
- * @author Kijin Sung <kijin@kijinsung.com>
  */
 class Mail extends Rhymix\Framework\Mail
 {
@@ -241,5 +239,3 @@ class Mail extends Rhymix\Framework\Mail
 	}
 
 }
-/* End of file Mail.class.php */
-/* Location: ./classes/mail/Mail.class.php */
diff --git a/classes/mobile/Mobile.class.php b/classes/mobile/Mobile.class.php
index 6f6581321..c3e857c1e 100644
--- a/classes/mobile/Mobile.class.php
+++ b/classes/mobile/Mobile.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * Mobile class
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index dc27489f3..f0b7bf3f0 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -1,15 +1,10 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
- * @class ModuleHandler
- * @author NAVER (developers@xpressengine.com)
- * Handling modules
+ * ModuleHandler
  *
- * @remarks This class is to excute actions of modules.
- *          Constructing an instance without any parameterconstructor, it finds the target module based on Context.
- *          If there is no act on the found module, excute an action referencing action_forward.
- * */
+ * @author NAVER (developers@xpressengine.com)
+ */
 class ModuleHandler extends Handler
 {
 	var $method = 'GET';
@@ -1472,5 +1467,3 @@ class ModuleHandler extends Handler
 	}
 
 }
-/* End of file ModuleHandler.class.php */
-/* Location: ./classes/module/ModuleHandler.class.php */
diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index 1b7d67cd1..d6baa5539 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -1,10 +1,9 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
- * @class ModuleObject
+ * ModuleObject
+ *
  * @author NAVER (developers@xpressengine.com)
- * base class of ModuleHandler
  */
 class ModuleObject extends BaseObject
 {
@@ -784,5 +783,3 @@ class ModuleObject extends BaseObject
 		}
 	}
 }
-/* End of file ModuleObject.class.php */
-/* Location: ./classes/module/ModuleObject.class.php */
diff --git a/classes/object/Object.class.php b/classes/object/Object.class.php
index ceb52d1f0..ad799387e 100644
--- a/classes/object/Object.class.php
+++ b/classes/object/Object.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * Every module inherits from BaseObject class.
@@ -323,6 +322,3 @@ class BaseObject
 		return $this->toBool();
 	}
 }
-
-/* End of file Object.class.php */
-/* Location: ./classes/object/Object.class.php */
diff --git a/classes/page/PageHandler.class.php b/classes/page/PageHandler.class.php
index f76070d74..ba5c94234 100644
--- a/classes/page/PageHandler.class.php
+++ b/classes/page/PageHandler.class.php
@@ -1,14 +1,9 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
- * @class PageHandler
- * @author NAVER (developers@xpressengine.com)
- * handles page navigation
- * @version 0.1
+ * PageHandler
  *
- * @remarks Getting total counts, number of pages, current page number, number of items per page,
- *          this class implements methods and contains variables for page navigation
+ * @author NAVER (developers@xpressengine.com)
  */
 class PageHandler extends Handler implements Iterator
 {
@@ -146,5 +141,3 @@ class PageHandler extends Handler implements Iterator
 		$this->point++;
 	}
 }
-/* End of file PageHandler.class.php */
-/* Location: ./classes/page/PageHandler.class.php */
diff --git a/classes/security/EmbedFilter.class.php b/classes/security/EmbedFilter.class.php
index cf0df75fe..a92daa59a 100644
--- a/classes/security/EmbedFilter.class.php
+++ b/classes/security/EmbedFilter.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class EmbedFilter
 {
@@ -77,5 +76,3 @@ class EmbedFilter
 		// This functionality has been moved to the HTMLFilter class.
 	}
 }
-/* End of file : EmbedFilter.class.php */
-/* Location: ./classes/security/EmbedFilter.class.php */
diff --git a/classes/security/IpFilter.class.php b/classes/security/IpFilter.class.php
index 18d37c5b0..32468ca5d 100644
--- a/classes/security/IpFilter.class.php
+++ b/classes/security/IpFilter.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class IpFilter
 {
@@ -15,6 +14,3 @@ class IpFilter
 	}
 
 }
-
-/* End of file : IpFilter.class.php */
-/* Location: ./classes/security/IpFilter.class.php */
diff --git a/classes/security/Password.class.php b/classes/security/Password.class.php
index 5dfb2152a..38fba605e 100644
--- a/classes/security/Password.class.php
+++ b/classes/security/Password.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class Password
 {
@@ -91,5 +90,3 @@ class Password
 		return Rhymix\Framework\Security::compareStrings($a, $b);
 	}
 }
-/* End of file : Password.class.php */
-/* Location: ./classes/security/Password.class.php */
diff --git a/classes/security/Purifier.class.php b/classes/security/Purifier.class.php
index 41d0af974..cd84749c2 100644
--- a/classes/security/Purifier.class.php
+++ b/classes/security/Purifier.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 class Purifier
 {
@@ -14,5 +13,3 @@ class Purifier
 	}
 
 }
-/* End of file : Purifier.class.php */
-/* Location: ./classes/security/Purifier.class.php */
diff --git a/classes/security/Security.class.php b/classes/security/Security.class.php
index 10d3b25f5..ee052573e 100644
--- a/classes/security/Security.class.php
+++ b/classes/security/Security.class.php
@@ -1,12 +1,9 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
- * - Security class
- * - This class helps to solve security problems.
+ * Security class
+ *
  * @author NAVER (developers@xpressengine.com)
- * @package /classes/security
- * @version 0.1
  */
 class Security
 {
@@ -188,5 +185,3 @@ class Security
 		return !Rhymix\Framework\Security::checkXXE($xml);
 	}
 }
-/* End of file : Security.class.php */
-/* Location: ./classes/security/Security.class.php */
diff --git a/classes/security/UploadFileFilter.class.php b/classes/security/UploadFileFilter.class.php
index a27279c36..219d1f99c 100644
--- a/classes/security/UploadFileFilter.class.php
+++ b/classes/security/UploadFileFilter.class.php
@@ -27,6 +27,3 @@ class UploadFileFilter
 		return Rhymix\Framework\Filters\FileContentFilter::check($file, $filename);
 	}
 }
-
-/* End of file : UploadFileFilter.class.php */
-/* Location: ./classes/security/UploadFileFilter.class.php */
diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index 131c7648f..bc8abfc49 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -1,13 +1,9 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
- * @class TemplateHandler
+ * Template compiler
+ *
  * @author NAVER (developers@xpressengine.com)
- * template compiler
- * @version 0.1
- * @remarks It compiles template file by using regular expression into php
- *          code, and XE caches compiled code for further uses
  */
 class TemplateHandler
 {
@@ -1159,5 +1155,3 @@ class TemplateHandler
 		return '&#x1B;&#x' . strtoupper(bin2hex($char)) . ';';
 	}
 }
-/* End of File: TemplateHandler.class.php */
-/* Location: ./classes/template/TemplateHandler.class.php */
diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php
index 9cfc562d8..f58b732e2 100644
--- a/classes/validator/Validator.class.php
+++ b/classes/validator/Validator.class.php
@@ -1,11 +1,9 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * Validator class
+ *
  * @author NAVER (developers@xpressengine.com)
- * @package /classes/validator
- * @version 0.1
  */
 class Validator
 {
@@ -853,5 +851,3 @@ class Validator
 	}
 
 }
-/* End of file Validator.class.php */
-/* Location: ./classes/validator/Validator.class.php */
diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php
index 6f15f771f..54994a39f 100644
--- a/classes/widget/WidgetHandler.class.php
+++ b/classes/widget/WidgetHandler.class.php
@@ -1,15 +1,11 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
- * @class WidgetHandler
+ * WidgetHandler
+ *
  * @author NAVER (developers@xpressengine.com)
- * @brief Handler class for widget execution
- * @remark it is empty for now, it would be removed in the future
  */
 class WidgetHandler
 {
 	var $widget_path = '';
 }
-/* End of file WidgetHandler.class.php */
-/* Location: ./classes/widget/WidgetHandler.class.php */
diff --git a/classes/xml/GeneralXmlParser.class.php b/classes/xml/GeneralXmlParser.class.php
index e742d7420..9416ca13a 100644
--- a/classes/xml/GeneralXmlParser.class.php
+++ b/classes/xml/GeneralXmlParser.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * GeneralXmlParser class
@@ -102,5 +101,3 @@ class GeneralXmlParser
 	}
 
 }
-/* End of file GeneralXmlParser.class.php */
-/* Location: ./classes/xml/GeneralXmlParser.class.php */
diff --git a/classes/xml/XmlGenerator.class.php b/classes/xml/XmlGenerator.class.php
index 1d738556f..b8a3719b7 100644
--- a/classes/xml/XmlGenerator.class.php
+++ b/classes/xml/XmlGenerator.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * XmlGenerator class
@@ -72,5 +71,3 @@ class XmlGenerator
 	}
 
 }
-/* End of file XmlGenerator.class.php */
-/* Location: ./classes/xml/XmlGenerator.class.php */
diff --git a/classes/xml/XmlJsFilter.class.php b/classes/xml/XmlJsFilter.class.php
index d1da97c6d..a519e8bb6 100644
--- a/classes/xml/XmlJsFilter.class.php
+++ b/classes/xml/XmlJsFilter.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * filter class traslate xml content into javascript code
@@ -424,5 +423,3 @@ class XmlJsFilter extends XeXmlParser
 	}
 
 }
-/* End of file XmlJsFilter.class.php */
-/* Location: ./classes/xml/XmlJsFilter.class.php */
diff --git a/classes/xml/XmlLangParser.class.php b/classes/xml/XmlLangParser.class.php
index 9a0dc11f9..acf43a065 100644
--- a/classes/xml/XmlLangParser.class.php
+++ b/classes/xml/XmlLangParser.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * XmlLangParser class
@@ -275,5 +274,3 @@ class XmlLangParser extends XeXmlParser
 	}
 
 }
-/* End of file XmlLangParser.class.php */
-/* Location: ./classes/xml/XmlLangParser.class.php */
diff --git a/classes/xml/XmlParser.class.php b/classes/xml/XmlParser.class.php
index a749e9d74..c23a2557b 100644
--- a/classes/xml/XmlParser.class.php
+++ b/classes/xml/XmlParser.class.php
@@ -1,5 +1,4 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
  * Xml_Node_ class
@@ -245,6 +244,3 @@ if (!class_exists('XmlParser', false))
 {
 	class_alias('XeXmlParser', 'XmlParser');
 }
-
-/* End of file XmlParser.class.php */
-/* Location: ./classes/xml/XmlParser.class.php */
diff --git a/common/legacy.php b/common/legacy.php
index 54f591b0f..c7056c52f 100644
--- a/common/legacy.php
+++ b/common/legacy.php
@@ -1372,6 +1372,3 @@ function reload($isOpener = FALSE)
 	$reloadScript = $isOpener ? 'window.opener.location.reload();' : 'window.location.reload();';
 	echo sprintf('<script> %s </script>', $reloadScript);
 }
-
-/* End of file func.inc.php */
-/* Location: ./config/func.inc.php */