Revert "BROKEN COMMIT Started to fix the "memory leak""

This reverts commit b75c507f924836906818dcdc0498fc9d40b07be5.