remove closure magic

The code was kind of unreadable, removed the black box stuff