branch cleanup and add zipfiles