Start ripping out the custom WS code.