Fix javadoc typo
Clean up deprecated API