diff --git a/main/config.guess b/main/config.guess
old mode 100644
new mode 100755
diff --git a/main/configure.ac b/main/configure.ac
index d6e943ecae..9a2585c8ff 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -3647,19 +3647,6 @@ else
 fi
 AC_SUBST(GPERF)
 
-dnl ===================================================================
-dnl Check for building stax
-dnl ===================================================================
-AC_MSG_CHECKING([whether to build the stax])
-if test -f "./stax/download/stax-1.2.0.jar"; then
-   BUILD_STAX=NO
-   AC_MSG_RESULT([no, will use the prebuilt stax/download/stax-1.2.0.jar])
-else
-   BUILD_STAX=YES
-   AC_MSG_RESULT([yes])
-fi
-AC_SUBST(BUILD_STAX)
-
 dnl ===================================================================
 dnl Check for building ODK
 dnl ===================================================================
diff --git a/main/external_deps.lst b/main/external_deps.lst
index e60f57cf32..25a2d21a5a 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -186,12 +186,6 @@ if (SOLAR_JAVA == TRUE)
     URL1 = https://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
-if (SOLAR_JAVA == TRUE)
-    MD5 = 980143f96b3f6ce45d2e4947da21a5e9
-    name = stax-src-1.2.0.zip
-    URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
-    URL2 = http://maven.ibiblio.org/maven/stax/jars/stax-src-1.2.0.zip
-
 if (ENABLE_MEDIAWIKI == YES)
     MD5 = a7983f859eafb2677d7ff386a023bc40
     name = xsltml_2.1.2.zip
diff --git a/main/saxon/prj/build.lst b/main/saxon/prj/build.lst
index 813097c66d..de579a0474 100644
--- a/main/saxon/prj/build.lst
+++ b/main/saxon/prj/build.lst
@@ -1,2 +1,2 @@
-xx	saxon	:	solenv stax NULL
+xx	saxon	:	solenv NULL
 xx	saxon	nmake	-	all	xx_saxon NULL
diff --git a/main/set_soenv.in b/main/set_soenv.in
index d10463abf1..e240e83830 100644
--- a/main/set_soenv.in
+++ b/main/set_soenv.in
@@ -2018,7 +2018,6 @@ ToFile( "RAT_JAR_HOME",      "@RAT_JAR_HOME@",     "e" );
 ToFile( "DMAKE_URL",         "@DMAKE_URL@",        "e" );
 ToFile( "DMAKE_PATH",        "@DMAKE_PATH@",       "e" );
 ToFile( "IS_SYSTEM_DMAKE",   "@IS_SYSTEM_DMAKE@",  "e" );
-ToFile( "BUILD_STAX",        "@BUILD_STAX@",       "e" );
 ToFile( "BUILD_UNOWINREG",   "@BUILD_UNOWINREG@",  "e" );
 ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );
 ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
diff --git a/main/solenv/bin/deliver.pl b/main/solenv/bin/deliver.pl
index 1205b9c3fb..f4b9df49cf 100755
--- a/main/solenv/bin/deliver.pl
+++ b/main/solenv/bin/deliver.pl
@@ -973,6 +973,9 @@ sub get_latest_patchlevel
 
         for ($i = 0; $i < 3; $i++)
           {
+              # if unitialized assign 0 as default value.
+              $field_a[$i] //= 0;
+              $field_b[$i] //= 0;
               if ( ($field_a[$i] < $field_b[$i]) ) {
                   return -1;
               }
diff --git a/main/stax/download/README_stax-1.2.0.jar.txt b/main/stax/download/README_stax-1.2.0.jar.txt
deleted file mode 100644
index c2f4365afb..0000000000
--- a/main/stax/download/README_stax-1.2.0.jar.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-The JSR173 is the XML pull API used at build time for the Saxon-B
-XSLT processor: it has become part of OpenJDK 6.
-
-When using an older JDK, you can get the API from
-    http://dist.codehaus.org/stax/jars/
-located at the StAX Home site
-    http://stax.codehaus.org/
-and put it under stax/download.
-
-1.2 Release(final) is available under the Apache License 2.0.
-
-Checksum (for reference):
-MD5 (stax-1.2.0.jar) = aa3439d235f7d999532b66bac56c1f87
diff --git a/main/stax/makefile.mk b/main/stax/makefile.mk
deleted file mode 100644
index d4883e8e63..0000000000
--- a/main/stax/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=.
-
-PRJNAME=stax
-TARGET=stax
-USE_JAVAVER=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : antsettings.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-.IF "$(JAVANUMVER:s/.//)" >= "000100060000" || "$(JDK)"=="gcj"
-all:
-	@echo "Your java version already contains StAX"
-.ENDIF			# "$(JAVANUMVER:s/.//)" >= "000100060000" 
-.IF "$(SYSTEM_SAXON)" == "YES"
-all:
-	@echo "An already available installation of saxon should exist on your system."
-	@echo "Therefore the files provided here does not need to be built in addition."
-.ENDIF
-
-.IF "$(BUILD_STAX)" != "YES"
-
-$(OUT)$/class$/stax-1.2.0.jar : $(PRJ)$/download$/stax-1.2.0.jar
-	+$(COPY) $< $@
-
-.ELSE 			#  "$(BUILD_STAX)" != "YES"
-
-# --- Files --------------------------------------------------------
-TARFILE_NAME=stax-src-1.2.0
-TARFILE_MD5=980143f96b3f6ce45d2e4947da21a5e9
-TARFILE_ROOTDIR=src
-
-BUILD_ACTION=$(JAVAC) javax$/xml$/stream$/*.java && jar -cf stax-1.2.0.jar javax$/xml$/stream$/*.class javax$/xml$/stream$/events$/*.class javax$/xml$/stream$/util$/*.class
-
-OUT2CLASS=stax-1.2.0.jar
-.ENDIF			#  "$(BUILD_STAX)" != "YES"
-
-.ELSE			# $(SOLAR_JAVA)!= ""
-nojava:
-	@echo "Not building $(PRJNAME) because Java is disabled"
-.ENDIF			# $(SOLAR_JAVA)!= ""
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.IF "$(SOLAR_JAVA)" != ""
-.INCLUDE : tg_ext.mk
-.ENDIF
-
diff --git a/main/stax/prj/build.lst b/main/stax/prj/build.lst
deleted file mode 100644
index cbfc6ea3ba..0000000000
--- a/main/stax/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-tx stax : solenv NULL
-tx stax nmake - all tx_stax NULL
diff --git a/main/stax/prj/d.lst b/main/stax/prj/d.lst
deleted file mode 100644
index 4345d5b884..0000000000
--- a/main/stax/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-..\%__SRC%\class\stax*.jar %_DEST%\bin%_EXT%