twsi: sort headers, remove unneeded
(cherry picked from commit 26559dd1770bb49c68f58a5fbcea3b4c96534c94)