cleaned up some code.

FSM part of Configurer now.