Started cleanup of cross validation. Removed lots of functionality, but much of it was broken.