Hrm I like the idea of removing unnecessary cruft but I'm also scared of regressions since there aren't any tests (until you wrote some!)...