some fixes for s2w and dt2w
delete some useless files