FIX: kill/cancle removed