Cleanup unused states

Not all the states are actively being used in any of
the taskflow code, so instead of keeping them around
lets just clean them up.

Fixes: bug 1232168

Change-Id: Ife92febe70692638bca4551766769a903273513f
Merge "Cleanup unused states"