CX-028664: Remove Wall