file system changes and clean up