Remove remaining references to multifolder