Cleanup again and again...