Remove calls to Utils and add mapcat impl