clean up and regression