Javadocs; delete redundant data structure.