Completed routine index updated. Lots of old unused code, but I'm committing it in case I want to look at it later.
Fixed training data and all fixtures for expectation_id in CompletedExpectation.