Removing state for now, but keeping it for reference.