diff --git a/toolchain/android-toolchain-gcc.xml b/toolchain/android-toolchain-gcc.xml
index aadca22ff..2e373c1a0 100644
--- a/toolchain/android-toolchain-gcc.xml
+++ b/toolchain/android-toolchain-gcc.xml
@@ -1,6 +1,6 @@
 <xml>
 
-<!-- Android TOOLS -------------------------------------->
+<!-- Android TOOLS -->
 <!--
   Configure build via variables, otherwise defaults will be used:
      Set the path to the exact ndk to use with ANDROID_NDK_ROOT,
diff --git a/toolchain/blackberry-toolchain.xml b/toolchain/blackberry-toolchain.xml
index 0e5b18ea8..4ae83a689 100644
--- a/toolchain/blackberry-toolchain.xml
+++ b/toolchain/blackberry-toolchain.xml
@@ -23,7 +23,7 @@
 <include name="toolchain/gcc-toolchain.xml"/>
 
 
-<!-- BLACKBERRY TOOLS -------------------------------------------------->
+<!-- BLACKBERRY TOOLS -->
 	
 <compiler id="blackberry" exe="qcc" if="blackberry">
 	<flag value="-V${QCC_TARGET}" />
diff --git a/toolchain/cygwin-toolchain.xml b/toolchain/cygwin-toolchain.xml
index 91f373911..47f79f7a2 100644
--- a/toolchain/cygwin-toolchain.xml
+++ b/toolchain/cygwin-toolchain.xml
@@ -1,4 +1,4 @@
-<!-- CYGWIN TOOLS -------------------------------------->
+<!-- CYGWIN TOOLS -->
 <xml>
 <include name="toolchain/gcc-toolchain.xml"/>
 
@@ -44,4 +44,3 @@
 </linker>
 
 </xml>
-
diff --git a/toolchain/emscripten-toolchain.xml b/toolchain/emscripten-toolchain.xml
index ab5316a57..61c73fffb 100644
--- a/toolchain/emscripten-toolchain.xml
+++ b/toolchain/emscripten-toolchain.xml
@@ -131,7 +131,6 @@
   <flag value="-fpic" if="HXCPP_EMSCRIPTEN_FPIC" />
   <flag value="-fPIC" if="HXCPP_EMSCRIPTEN_FPIC" />
   <flag value="--bind" if="HXCPP_JS_PRIME" />
-  <!-- <flag value="-Wl,--unresolved-symbols=report-all"/> -->
   <flag value="-Xlinker"/>
   <flag value="--no-undefined" unless="HXCPP_ALLOW_UNDEFINED" />
   <flag value="${HXCPP_LINK_OPTIM_LEVEL}"/>
@@ -185,14 +184,6 @@
      <flag value="TOTAL_MEMORY=${HXCPP_LINK_TOTAL_MEMORY}" />
   </section>
 
-
-  <!-- Only for asmjs
-  <section if="HXCPP_LINK_MEM_FILE" >
-    <flag value="--memory-init-file"/>
-    <flag value="${HXCPP_LINK_MEM_FILE}"/>
-  </section>
-  -->
-
   <section if="HXCPP_LINK_EMRUN" >
      <flag value="--emrun" />
   </section>
diff --git a/toolchain/gph-toolchain.xml b/toolchain/gph-toolchain.xml
index 80da6850c..b01103ad8 100644
--- a/toolchain/gph-toolchain.xml
+++ b/toolchain/gph-toolchain.xml
@@ -1,6 +1,6 @@
 <xml>
 
-<!-- GPH (Caanoo) TOOLS -------------------------------------------------->
+<!-- GPH (Caanoo) TOOLS -->
 	
 <error value="Please define GPH_ROOT" unless="GPH_ROOT"/>
 
diff --git a/toolchain/linux-toolchain.xml b/toolchain/linux-toolchain.xml
index ed0880532..b151ec211 100644
--- a/toolchain/linux-toolchain.xml
+++ b/toolchain/linux-toolchain.xml
@@ -1,6 +1,6 @@
 <xml>
 
-<!-- LINUX TOOLS -------------------------------------->
+<!-- LINUX TOOLS -->
 
 
 <section if="xcompile" >
@@ -70,7 +70,6 @@
   <flag value="-fPIC"/>
   <flag value="-m32" unless="noM32"/>
   <flag value="-m64" if="HXCPP_M64" unless="noM64" />
-  <!-- <flag value="-Wl,--unresolved-symbols=report-all"/> -->
   <flag value="-Xlinker"/>
   <flag value="--no-undefined" unless="HXCPP_ALLOW_UNDEFINED" />
   <flag value="-debug" if="debug"/>
diff --git a/toolchain/mingw-toolchain.xml b/toolchain/mingw-toolchain.xml
index c1dce197d..2e545ecd4 100644
--- a/toolchain/mingw-toolchain.xml
+++ b/toolchain/mingw-toolchain.xml
@@ -1,6 +1,6 @@
 <xml>
 
-<!-- MINGW TOOLS -------------------------------------->
+<!-- MINGW TOOLS -->
 
 <section if="linux_host||mac_host">
   <section if="HXCPP_M64">
diff --git a/toolchain/msvc-toolchain.xml b/toolchain/msvc-toolchain.xml
index 1897356e9..e504a6b62 100644
--- a/toolchain/msvc-toolchain.xml
+++ b/toolchain/msvc-toolchain.xml
@@ -1,7 +1,7 @@
 <xml>
 
 
-<!-- WINDOWS TOOLS -------------------------------------->
+<!-- WINDOWS TOOLS -->
 
 
 
diff --git a/toolchain/tizen-toolchain.xml b/toolchain/tizen-toolchain.xml
index e20bcafd1..f1a75ece3 100644
--- a/toolchain/tizen-toolchain.xml
+++ b/toolchain/tizen-toolchain.xml
@@ -33,7 +33,7 @@
 <include name="toolchain/gcc-toolchain.xml"/>
 
 
-<!-- TIZEN TOOLS -------------------------------------------------->
+<!-- TIZEN TOOLS -->
 	
 <compiler id="tizen" exe="${EXEPREFIX}-g++" if="tizen">
 	<flag value="-c"/>
diff --git a/toolchain/webos-toolchain.xml b/toolchain/webos-toolchain.xml
index da9f05082..db7bf8da7 100644
--- a/toolchain/webos-toolchain.xml
+++ b/toolchain/webos-toolchain.xml
@@ -12,7 +12,7 @@
 <include name="toolchain/gcc-toolchain.xml"/>
 
 
-<!-- WEBOS TOOLS -------------------------------------------------->
+<!-- WEBOS TOOLS -->
 	
 <compiler id="webos" exe="arm-none-linux-gnueabi-g++" if="webos">
 	<flag value="-c"/>