Removing some dead weight, references to data structures that are not going to be used.