Removing more closures