cleanup and added zips