core cleanup: move account fields out