starting to remove user references