Clean-up the mess :-)