fix cb/promise stuff for destroy