Remove/Consolidate HasSteps and similar classes #19

- Removes HasSteps class