Remove unused methods; reorganize index