Remove utility class in favor of memoization