Remove Java stuff, add Javadoc