Cleanup and CURL fix