Fix destroy cleanup (#142)