Removed old special case
More special cases removed
Limit number of times addold are echoed
Removed unnecessary checks for announce status