misc clean up.