More state in controller. Some metric cleanup.