cleanup more stuff
complex obfuscation issue appears to be resolved swapping back to using TCon Lib's implementations of these