Merge "fs_mgr: remove some dead code"