Just Memory leaks left..
Revert "Just Memory leaks left.."

This reverts commit 5215458f532d250a194bbfd15b771d249dd0f3db.
sdfadggdfg