cleanup and more work on friends