Revert "Memory Leak"

This reverts commit c6d25fe1a2b78228b5af47fc9d8b8699b8464b5a.