Commented out mapId code since it is not used