Improve removing letter headers
This fix will be superceded by LT-15161