Map.ts cleaning