core cleanup: move out status field