Remove unnecessary entity encoding