Random bits of cleanup