First stage of WX dependency removal.