A lot of cleaning, decided to ditch Z