A little cleanup never hurt nobody