Removed new_relic, slight cleanup