remove goto 2