Reduction of ESX redundant code