fix zombies and remove old stuff