bits of cleanup