remove W_* macros