Remove echo short codes 

Maximize version compatibility