Clean up and added unzip.