Cleaning Up Friend(Gateway/Mapper)