Cleanup (a debug alert less)