some auto-friending cleanups