remove extra onlyif