Unused utils removed
MIG-39 fixed
MIG-42 fixed on master