cleaned Some StringTemplate file for Storage Entity