undone : remove some extraneous closures