fix the clean up.