Fix integer overflow & removed obsolete code & announce separated from announce-list(only one is used)