some misc clean up