Remove unused utility class