Clean up step identification logic
v0.2.1