Removing more unused references.