remove more closures