Simplification
Some New Relic-related cleanup