Javadoc and removing pointless code