Removing redundant sender endpoint generator