Backports to 1.7.x

Removing unneeded header file and strange characters from the POM