Improvement on memory leaks, but still have two collections when I really just need one