Cleaning up #fallbackTo
Cleaning up #zip