better cleanup of this example