Changing back to using CoFHLib TE helper and removing own code, now that CoFHLib is fixed