remove goto