removed CE/WM defines