remove some more 'throws'