s2w: heavy cleanup, remove debug/unnecessary lines