remove idmap dependency