core cleanup: move out email & user_states field