Flat zombies cleanup (41/48)

Flat zombies cleanup