Remove (require 'init-java); add sae support