Cleaning up stepgen