Remove unused-empty helpers and TWS