Fix a problem with the cleanup patch for TRQ-1776. I was overloading a substate and this caused other complications. Resolved by moving it to its own substate.