Bits of cleanup