Removing code that can't easily be unit tested. Will have to grab in integration tests. [#2380123]