Remove old singleton references in NPAnalytics