Removed tmp-ids and remap