Cleanup the mess