OOM handling/cleanup slight adjustments
5 files changed