Cleaned the mess (a bit).