Cleaning up some unused files and folders