reverted BuiltinIProc
cleanup builtin.[cc, hh]