I think the cleanup decorator is only for when we are plotting