removed all references to currentUser