implements #89. also remove some old routes
#89 - new indexes