Java home
Remove janus
Re-add Janus
Yo
Fix merge conflicts