Removed entity decoding entirely