little bits of cleanup.