Removing code that won't be called