Commit-2: removed redundant data structures