A little more prompt cleanup