Removed tmp ids and remapped