Javadocs and removed Deprecated annotation.