Zombie sighting fix and remove unwanted functions and imports