Cleaning up java branch