Remove Spork and Guard and add Zeus