Removed some references to old folder-loader.