#236 Got rid of some crufty classes, labeled other crufty classes as archival for future references.