Remove possible memory leak