Added zombie clean logic