remove some -W