Convert regression classes to builder pattern.
Remove extraneous methods and classes