Kill list

merge kill list changes