Remove the StepPool and ContentData classes