CLEANUP more dead code in lswsctrl...