Comment ouf map stuff for now