remove some more Future