Fix: memory leak. Clean up