Viscera cleanup (36/48)

Viscera cleanup