* Grave digging and decomposition * fix * update based on review comments * code review * remove unused field