Cleanup #5 & Memory leak fix