even more gotos removed