SWI cleanup