some resource cleanup in assign code paths
more resource cleanup work