Removed unnecessary code now that we have a robust solution to the NoReturn issue