Merge "Remove obsolete files from fs_config's list."