misc clean up