some clean up work