cleanup a few things busted in my last change