Moved temp entry/delete out of the object datastream creation routine.