Remove storing original id and idtype hack and deleted commented out
code.