Continuing work to remove twitter specific terms wherever possible