touchscreen: S2W cleanup