remove joints when body removed, updated todo