clean up some more guid-related items