Removing old throw code