diff --git a/build.xml b/build.xml
index 8ac6c12b..4d7d6ccb 100644
--- a/build.xml
+++ b/build.xml
@@ -247,8 +247,6 @@
 			<option value="-Xdock:name=${title}" />
 			<option value="-Dcom.apple.macos.use-file-dialog-packages=true" />
 			<option value="-Dcom.apple.macos.useScreenMenuBar=true" />
-			
-			<option value="-XX:+TieredCompilation" />
 		</bundleapp>
 		
 		<!-- application bundle folder as .tar.gz -->
diff --git a/installer/appbundle/filebot.sh b/installer/appbundle/filebot.sh
index c0d495fd..d06ac49f 100644
--- a/installer/appbundle/filebot.sh
+++ b/installer/appbundle/filebot.sh
@@ -5,4 +5,4 @@ SOURCE="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 APP_ROOT="$SOURCE/../.."
 
-java -XX:+TieredCompilation -Djava.awt.headless=true -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=app "-Djna.library.path=$APP_ROOT/Contents/MacOS" "-Djava.library.path=$APP_ROOT/Contents/MacOS" "-Dnet.filebot.AcoustID.fpcalc=$APP_ROOT/Contents/MacOS/fpcalc" -jar "$APP_ROOT"/Contents/Java/* "$@"
+java -Djava.awt.headless=true -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=app "-Djna.library.path=$APP_ROOT/Contents/MacOS" "-Djava.library.path=$APP_ROOT/Contents/MacOS" "-Dnet.filebot.AcoustID.fpcalc=$APP_ROOT/Contents/MacOS/fpcalc" -jar "$APP_ROOT"/Contents/Java/* "$@"
diff --git a/installer/deb/filebot.sh b/installer/deb/filebot.sh
index 8ff75c81..5a949264 100644
--- a/installer/deb/filebot.sh
+++ b/installer/deb/filebot.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -XX:+TieredCompilation -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=deb -Dapplication.analytics=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dnet.filebot.AcoustID.fpcalc=/usr/share/filebot/fpcalc -jar /usr/share/filebot/FileBot.jar "$@"
\ No newline at end of file
+java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.deployment=deb -Dapplication.analytics=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -Dnet.filebot.AcoustID.fpcalc=/usr/share/filebot/fpcalc -jar /usr/share/filebot/FileBot.jar "$@"
diff --git a/installer/msi/filebot.launcher.l4j.ini b/installer/msi/filebot.launcher.l4j.ini
index e29792c3..afcea35d 100644
--- a/installer/msi/filebot.launcher.l4j.ini
+++ b/installer/msi/filebot.launcher.l4j.ini
@@ -28,6 +28,3 @@
 
 # look for fpcalc here
 -Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
-
-# boost application startup speed
--XX:+TieredCompilation
diff --git a/installer/msi/filebot.platform.launcher.l4j.ini b/installer/msi/filebot.platform.launcher.l4j.ini
index 83bab63f..0ae74606 100644
--- a/installer/msi/filebot.platform.launcher.l4j.ini
+++ b/installer/msi/filebot.platform.launcher.l4j.ini
@@ -45,6 +45,3 @@
 
 # force platform L&F
 -Dswing.systemlaf=javax.swing.plaf.nimbus.NimbusLookAndFeel
-
-# boost application startup speed
--XX:+TieredCompilation
diff --git a/installer/portable/FileBot.l4j.ini b/installer/portable/FileBot.l4j.ini
index 75c5eee0..385bb9f1 100644
--- a/installer/portable/FileBot.l4j.ini
+++ b/installer/portable/FileBot.l4j.ini
@@ -35,6 +35,3 @@
 # store preferences to text file
 -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory
 -Dnet.filebot.util.prefs.file="%EXEDIR%\prefs.properties"
-
-# boost application startup speed
--XX:+TieredCompilation
diff --git a/installer/ubuntu/filebot.sh b/installer/ubuntu/filebot.sh
index 3f1d516a..5576f8f6 100644
--- a/installer/ubuntu/filebot.sh
+++ b/installer/ubuntu/filebot.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -XX:+TieredCompilation -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.update=skip -Dapplication.deployment=ppa -Dapplication.analytics=false -Dapplication.warmup=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/opt/filebot -Djava.library.path=/opt/filebot -Dnet.filebot.AcoustID.fpcalc=fpcalc -jar /opt/filebot/FileBot.jar "$@"
\ No newline at end of file
+java -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Djna.nosys=true -Dapplication.update=skip -Dapplication.deployment=ppa -Dapplication.analytics=false -Dapplication.warmup=true -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/opt/filebot -Djava.library.path=/opt/filebot -Dnet.filebot.AcoustID.fpcalc=fpcalc -jar /opt/filebot/FileBot.jar "$@"