In #47, there were several dependencies which were removed.. but without a coresponding removal of use statements. This leads me to believe that we have a declared dependency on things.. but don't actually use them. We should have a linter which complains about stuff like that.