Cleanup unnecessary throws