remove some more gotos