Fixing html escaping issues
Removing .orig file