remove this.map stuff