Cleanup of regression code