get rid of closure nonsense