Fix Javadoc and removedeprecated class.