cleanup a few things