Even better cleanup