cleanup and add zip for submission