throws declarations cleanup