WIP: cleanup a few things.