Clean the mess up