cleanup & added friends