PLAT-6613 cleaned up legal entity utils