cleanup a couple of things