Unused utils removed
MIG-39 fixed