remove references to current_user