remove closure, simplify