Remove unused methods
Merge branch 'refs/heads/cohorts'