Merge "idmap2: Remove redundant "using" statements"