Fix broken Javadoc links
Remove deprecated API