Cleaned the mess (a bit more).