Memory management
Revert "Memory management"

This reverts commit b1d62b56acd806400856267865bbdc4dbc1efb53.