Remove the final reference to cleanup_value()