oldmap: rm unneeded unsafe