Fix bugs for promotion policy, and cleanup event list base on discussion