Remove TWS
Improve