Cleaned up java install, remove installing java 5.