add cleanup + info