Clean up model state a little bit, don't need to know about the old model state when setting up rendering