Get rid of a goto where there was no extra cleanup happening at the exit point