Trying to do some memory cleanup.
Merged.