Cleans up some more of the old 'object' User Id references.