misc. cleanup.