deleted old cohort restricted data definitions
removed more dependencies on cohort
updated caching strategies
REPORTS-174 adjusted address format