Add RAII like clean up