removed goto