cleaned up some throws declarations