Clean up stuff that were needed for ws_o