more misc. cleanup