Stage 3: Remove open/close in WM