Clean up of ObfuscationHelper