A little better cleanup