core cleanup: move out cal field