[s2w/dt2w/l2m/l2w] Adjustments and cleanup