clean up some stuff in osutils