Zak & Wheezie clean up

Zak & Wheezie clean up