Collection->map cleanup