TIKA-1446 - More clean up