INTEXT-44: More cleanup