Romove unnecessary proxy macro
Finish Zip (all tests pass)