Chipping away at the todo list, mostly removing legacy code.