Cleanup, added zipfile.