Better cleanup on production