add cleanup, rf. hook