Remove pathmap dependency