Comment out saving state. Needs performance improvements.