Remove aux state machine; going to cook in parameters and not do any others