Index: lams_build/build.xml
===================================================================
diff -u -rfd2cfad55c7c517931f69334ce644d509ec28140 -r658fe82d333cc79e8956978a0956960f728a7ff8
--- lams_build/build.xml	(.../build.xml)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
+++ lams_build/build.xml	(.../build.xml)	(revision 658fe82d333cc79e8956978a0956960f728a7ff8)
@@ -142,14 +142,6 @@
 
 	
 	<target name="build-db" description="Rebuilds LAMS Database.">
-		<echo>Copying embedded MySQL drivers to library dir, if available</echo>
-		<copy todir="../lams_build/lib/mysql" overwrite="false" verbose="true">
-			<fileset dir="../mysql_embedded/connectors" erroronmissingdir="false">
-				<include name="*-driver.jar" />
-				<include name="*-db-files-${osPropertiesName}.jar" />
-			</fileset>
-		</copy>
-		
 		<ant antfile="../lams_common/build.xml" target="build-db" inheritAll="false" />
 	</target>
 	
@@ -640,7 +632,6 @@
 			<fileset file="${conf.dir}/standalone.xml" />
 	        <filterset>
 	        	<filter token="db.url.run" value="${db.url.run}"/>
-	        	<filter token="db.location" value="${db.location}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
 	        	<filter token="db.timezone" value="${db.timezone}"/>
@@ -654,7 +645,6 @@
 			<fileset file="${conf.dir}/slim/standalone.xml" />
 	        <filterset>
 	        	<filter token="db.url.run" value="${db.url.run}"/>
-	        	<filter token="db.location" value="${db.location}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
 	        	<filter token="db.timezone" value="${db.timezone}"/>
@@ -752,7 +742,6 @@
 			</fileset>
 	        <filterset>
 	        	<filter token="db.url.run" value="${db.url.run}"/>
-	        	<filter token="db.location" value="${db.location}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
 	        	<filter token="db.timezone" value="${db.timezone}"/>
Index: lams_build/common.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658fe82d333cc79e8956978a0956960f728a7ff8
--- lams_build/common.properties	(.../common.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_build/common.properties	(.../common.properties)	(revision 658fe82d333cc79e8956978a0956960f728a7ff8)
@@ -69,26 +69,8 @@
 # you can set own timezone, for example "Europe/Warsaw"
 db.timezone=UTC
 
-# Basedir of embedded MySQL server. This is also the place where data is stored.
-# Set it if you use MXJ for running and/or building LAMS.
-db.location=C:/lams/database
-
-# To build LAMS using standalone MySQL server, use properties below
 db.url.build=jdbc:mysql://${db.host}:${db.port}/${db.name}?characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&autoReconnect=true&useUnicode=true&useSSL=false=&allowPublicKeyRetrieval=true&useLegacyDatetimeCode=false&serverTimezone=${db.timezone}
-db.url.init.build=${db.url.build}
-
-# To build LAMS using embedded MySQL server, use properties below
-# If you build LAMS this way, you will also need to run it using the embedded server.
-# db.config.build configuration is a replacement for my.ini and it's optional. If left blank, server defaults will be used.
-#db.config.build=&server.skip-external-locking&server.key_buffer_size=16K&server.max_allowed_packet=1M&server.table_open_cache=4&server.sort_buffer_size=64K&server.read_buffer_size=256K&server.read_rnd_buffer_size=257K&server.net_buffer_length=2K&server.thread_stack=128K
-#db.url.build=jdbc:mysql:mxj://localhost:13306/${db.name}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useUnicode=true&server.basedir=${db.location}${db.config.build}
-#db.url.init.build=${db.url.build}&server.initialize-user=true&createDatabaseIfNotExist=true
-
-# To run LAMS using standalone MySQL server, use properties below
 db.url.run=jdbc:mysql://${db.host}:${db.port}/${db.name}
 
-# To run LAMS using embedded MySQL server, use properties below
-#db.url.run=jdbc:mysql:mxj://localhost:13306/${db.name}
-
 #======== END DATABASE PROPERTIES =========
 
Index: lams_build/conf/domain.xml
===================================================================
diff -u -r88c8fa0dba475bf3ffa351ec1e6d889481e4dcbb -r658fe82d333cc79e8956978a0956960f728a7ff8
--- lams_build/conf/domain.xml	(.../domain.xml)	(revision 88c8fa0dba475bf3ffa351ec1e6d889481e4dcbb)
+++ lams_build/conf/domain.xml	(.../domain.xml)	(revision 658fe82d333cc79e8956978a0956960f728a7ff8)
@@ -232,19 +232,6 @@
 				    <connection-property name="useLegacyDatetimeCode">false</connection-property>
 				    <connection-property name="serverTimezone">@db.timezone@</connection-property>
 				    
-				    <!-- Properties below are used only for embedded MySQL server -->
-				    <connection-property name="server.basedir">@db.location@</connection-property>
-				    <connection-property name="createDatabaseIfNotExist">false</connection-property>
-				    <connection-property name="server.initialize-user">false</connection-property>
-				    <connection-property name="server.thread_stack">128K</connection-property>
-				    <connection-property name="server.table_cache">4</connection-property>
-				    <connection-property name="server.read_buffer_size">256K</connection-property>
-				    <connection-property name="server.read_rnd_buffer_size">256K</connection-property>
-				    <connection-property name="server.max_allowed_packet">1M</connection-property>
-				    <connection-property name="server.key_buffer">16K</connection-property>
-				    <connection-property name="server.sort_buffer_size">64K</connection-property>
-				    <connection-property name="server.net_buffer_length">2K</connection-property>
-				    
 				    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
 				    <pool>
 				      <min-pool-size>0</min-pool-size>
Index: lams_build/conf/slim/standalone.xml
===================================================================
diff -u -r88c8fa0dba475bf3ffa351ec1e6d889481e4dcbb -r658fe82d333cc79e8956978a0956960f728a7ff8
--- lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 88c8fa0dba475bf3ffa351ec1e6d889481e4dcbb)
+++ lams_build/conf/slim/standalone.xml	(.../standalone.xml)	(revision 658fe82d333cc79e8956978a0956960f728a7ff8)
@@ -249,19 +249,6 @@
 				    <connection-property name="useLegacyDatetimeCode">false</connection-property>
 				    <connection-property name="serverTimezone">@db.timezone@</connection-property>
 				    
-				    <!-- Properties below are used only for embedded MySQL server -->
-				    <connection-property name="server.basedir">@db.location@</connection-property>
-				    <connection-property name="createDatabaseIfNotExist">false</connection-property>
-				    <connection-property name="server.initialize-user">false</connection-property>
-				    <connection-property name="server.thread_stack">128K</connection-property>
-				    <connection-property name="server.table_cache">4</connection-property>
-				    <connection-property name="server.read_buffer_size">256K</connection-property>
-				    <connection-property name="server.read_rnd_buffer_size">256K</connection-property>
-				    <connection-property name="server.max_allowed_packet">1M</connection-property>
-				    <connection-property name="server.key_buffer">16K</connection-property>
-				    <connection-property name="server.sort_buffer_size">64K</connection-property>
-				    <connection-property name="server.net_buffer_length">2K</connection-property>
-				    
 				    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
 				    <pool>
 				      <min-pool-size>0</min-pool-size>
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r88c8fa0dba475bf3ffa351ec1e6d889481e4dcbb -r658fe82d333cc79e8956978a0956960f728a7ff8
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 88c8fa0dba475bf3ffa351ec1e6d889481e4dcbb)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 658fe82d333cc79e8956978a0956960f728a7ff8)
@@ -267,19 +267,6 @@
 				    <connection-property name="useLegacyDatetimeCode">false</connection-property>
 				    <connection-property name="serverTimezone">@db.timezone@</connection-property>
 				    
-				    <!-- Properties below are used only for embedded MySQL server -->
-				    <connection-property name="server.basedir">@db.location@</connection-property>
-				    <connection-property name="createDatabaseIfNotExist">false</connection-property>
-				    <connection-property name="server.initialize-user">false</connection-property>
-				    <connection-property name="server.thread_stack">128K</connection-property>
-				    <connection-property name="server.table_cache">4</connection-property>
-				    <connection-property name="server.read_buffer_size">256K</connection-property>
-				    <connection-property name="server.read_rnd_buffer_size">256K</connection-property>
-				    <connection-property name="server.max_allowed_packet">1M</connection-property>
-				    <connection-property name="server.key_buffer">16K</connection-property>
-				    <connection-property name="server.sort_buffer_size">64K</connection-property>
-				    <connection-property name="server.net_buffer_length">2K</connection-property>
-				    
 				    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
 				    <pool>
 				      <min-pool-size>0</min-pool-size>
Index: lams_common/build.xml
===================================================================
diff -u -rfd2cfad55c7c517931f69334ce644d509ec28140 -r658fe82d333cc79e8956978a0956960f728a7ff8
--- lams_common/build.xml	(.../build.xml)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
+++ lams_common/build.xml	(.../build.xml)	(revision 658fe82d333cc79e8956978a0956960f728a7ff8)
@@ -27,7 +27,7 @@
 		
 		<echo>Executing SQL scripts</echo>
 		<sql driver="com.mysql.cj.jdbc.Driver"
-		     url="${db.url.init.build}"
+		     url="${db.url.build}"
 			 userid="${db.username}"
 			 password="${db.password}"
 			 encoding="utf8">