remove closure.  too fancy