Removed goto