Removing unnecessary 'folder' and 'pool' params