Cleaning up the mess !