Clean up folder and code