diff --git a/.profile.d/java.sh b/.profile.d/java.sh
index 77d4f52..e57d7d7 100644
--- a/.profile.d/java.sh
+++ b/.profile.d/java.sh
@@ -1,2 +1,2 @@
-JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-13.0.2.jdk/Contents/Home
-export JAVA_HOME
+export JAVA_HOME=$(/usr/libexec/java_home -v 11)
+export JAVA_HOME_13=$(/usr/libexec/java_home -v 13)
diff --git a/.profile.d/jmeter.sh b/.profile.d/jmeter.sh
new file mode 100644
index 0000000..d413316
--- /dev/null
+++ b/.profile.d/jmeter.sh
@@ -0,0 +1,2 @@
+export JMETER_HOME=`which jmeter`
+
diff --git a/.vimrc b/.vimrc
index a4ca2df..1a18827 100644
--- a/.vimrc
+++ b/.vimrc
@@ -3,5 +3,3 @@ set number
 set backupdir=~/.vim/backup,/tmp
 set wrapscan
 set guifont=Menlo\ for\ Powerline
-let g:opamshare = substitute(system('opam config var share'),'\n$','','''')
-execute "set rtp+=" . g:opamshare . "/merlin/vim"