Merge "Remove dead code from fs_mgr"