Remove all unneeded WS