Cleanup a few bits.