some cleanup, comparator-test is broken (from a while ago), needs to eventually be fixed