Merge "Remove critical code smells for utils classes"