Removing more PLOS specific code
Merge branch 'dev/etocs' into release/2.7.1rc