Remove generic end state and replace with specific end states for the last two places that use it