removed goto jank