Remove more nothrows