reorganized the doe a bit, removed unused methods