Added Cleanup folder and files to allow deleting deprecated legacy files and folders