* Grave digging and decomposition * fix * update based on review comments * code review * remove unused field (cherry picked from commit fd7ff690b1ad7b1cf6cd62deba3076684e3e9282)