core cleanup: move out regcallid field