Removing code that raises and returns