remove logic from Question that was keeping state