Remove unneeded goto